From 0e1372e1bd8f79fa295738bc1e983cb3648ba4be Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst Date: Mon, 19 Jan 2015 12:37:55 +0100 Subject: 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 Signed-off-by: Eric Anholt Reviewed-by: Eric Anholt Reviewed-by: Ian Romanick --- glamor/glamor_fbo.c | 1 - glamor/glamor_font.c | 1 - glamor/glamor_pixmap.c | 1 - 3 files changed, 3 deletions(-) (limited to 'glamor') 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); -- cgit v1.2.3