diff options
| author | Maarten Lankhorst <maarten.lankhorst@ubuntu.com> | 2015-01-19 12:37:55 +0100 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2015-03-24 12:01:38 -0700 |
| commit | 0e1372e1bd8f79fa295738bc1e983cb3648ba4be (patch) | |
| tree | c90fad04b44503794abbcebedafa94ddf77985b8 | |
| parent | c1f35c3d862f77cbd2fb871be5613fb0ca7e508b (diff) | |
glamor: GL_TEXTURE_MAX_LEVEL is not available on GLES2
Remove the calls to GL_TEXTURE_MAX_LEVEL. Setting the filtering is
a sufficient hint to the driver about texture mipmap allocation.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@ubuntu.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
| -rw-r--r-- | glamor/glamor_fbo.c | 1 | ||||
| -rw-r--r-- | glamor/glamor_font.c | 1 | ||||
| -rw-r--r-- | glamor/glamor_pixmap.c | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/glamor/glamor_fbo.c b/glamor/glamor_fbo.c index 8d73e4765..ad4dfe656 100644 --- a/glamor/glamor_fbo.c +++ b/glamor/glamor_fbo.c @@ -348,7 +348,6 @@ _glamor_create_tex(glamor_screen_private *glamor_priv, glamor_make_current(glamor_priv); glGenTextures(1, &tex); glBindTexture(GL_TEXTURE_2D, tex); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexImage2D(GL_TEXTURE_2D, 0, format, w, h, 0, diff --git a/glamor/glamor_font.c b/glamor/glamor_font.c index 0ca91fa2e..cc0fecf7a 100644 --- a/glamor/glamor_font.c +++ b/glamor/glamor_font.c @@ -97,7 +97,6 @@ glamor_font_get(ScreenPtr screen, FontPtr font) glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_2D, glamor_font->texture_id); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); diff --git a/glamor/glamor_pixmap.c b/glamor/glamor_pixmap.c index 947113ee9..0d92710cf 100644 --- a/glamor/glamor_pixmap.c +++ b/glamor/glamor_pixmap.c @@ -717,7 +717,6 @@ __glamor_upload_pixmap_to_texture(PixmapPtr pixmap, unsigned int *tex, } glBindTexture(GL_TEXTURE_2D, *tex); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glPixelStorei(GL_UNPACK_ALIGNMENT, 4); |