From 49b88d62fef1ded7acb7f6aee4c59f8e7e7fe2a4 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 28 Feb 2014 13:01:58 -0500 Subject: glamor: Drop useless glEnable/glDisable(GL_TEXTURE_2D) calls. Those calls are only for enabling texture handling in the fixed function pipeline, while everything we do is with shaders. Ported from Eric's xserver glamor tree. Signed-off-by: Eric Anholt Signed-off-by: Alex Deucher --- src/glamor_copyarea.c | 4 ---- src/glamor_pixmap.c | 6 ------ src/glamor_putimage.c | 2 -- src/glamor_render.c | 9 --------- src/glamor_tile.c | 6 ------ src/glamor_trapezoid.c | 6 ------ 6 files changed, 33 deletions(-) diff --git a/src/glamor_copyarea.c b/src/glamor_copyarea.c index accf0d1..c767b6c 100644 --- a/src/glamor_copyarea.c +++ b/src/glamor_copyarea.c @@ -226,7 +226,6 @@ glamor_copy_n_to_n_textured(DrawablePtr src, dispatch->glBindTexture(GL_TEXTURE_2D, src_pixmap_priv->base.fbo->tex); #ifndef GLAMOR_GLES2 - dispatch->glEnable(GL_TEXTURE_2D); dispatch->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER); @@ -277,9 +276,6 @@ glamor_copy_n_to_n_textured(DrawablePtr src, dispatch->glDisableVertexAttribArray(GLAMOR_VERTEX_POS); dispatch->glDisableVertexAttribArray(GLAMOR_VERTEX_SOURCE); -#ifndef GLAMOR_GLES2 - dispatch->glDisable(GL_TEXTURE_2D); -#endif dispatch->glUseProgram(0); /* The source texture is bound to a fbo, we have to flush it here. */ glamor_put_dispatch(glamor_priv); diff --git a/src/glamor_pixmap.c b/src/glamor_pixmap.c index 4e0f876..d0004a9 100644 --- a/src/glamor_pixmap.c +++ b/src/glamor_pixmap.c @@ -555,9 +555,6 @@ ready_to_upload: GL_NEAREST); dispatch->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); -#ifndef GLAMOR_GLES2 - dispatch->glEnable(GL_TEXTURE_2D); -#endif dispatch->glUseProgram(glamor_priv->finish_access_prog[no_alpha]); dispatch->glUniform1i(glamor_priv-> finish_access_revert[no_alpha], @@ -567,9 +564,6 @@ ready_to_upload: dispatch->glDrawArrays(GL_TRIANGLE_FAN, 0, 4); -#ifndef GLAMOR_GLES2 - dispatch->glDisable(GL_TEXTURE_2D); -#endif dispatch->glUseProgram(0); dispatch->glDisableVertexAttribArray(GLAMOR_VERTEX_POS); dispatch->glDisableVertexAttribArray(GLAMOR_VERTEX_SOURCE); diff --git a/src/glamor_putimage.c b/src/glamor_putimage.c index a77be6b..b58d71e 100644 --- a/src/glamor_putimage.c +++ b/src/glamor_putimage.c @@ -168,7 +168,6 @@ glamor_put_image_xybitmap(DrawablePtr drawable, GCPtr gc, dispatch->glGenTextures(1, &tex); dispatch->glActiveTexture(GL_TEXTURE0); - dispatch->glEnable(GL_TEXTURE_2D); dispatch->glBindTexture(GL_TEXTURE_2D, tex); dispatch->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); @@ -222,7 +221,6 @@ glamor_put_image_xybitmap(DrawablePtr drawable, GCPtr gc, glamor_set_alu(GXcopy); glamor_set_planemask(pixmap, ~0); dispatch->glDeleteTextures(1, &tex); - dispatch->glDisable(GL_TEXTURE_2D); dispatch->glDisableClientState(GL_VERTEX_ARRAY); dispatch->glDisableClientState(GL_TEXTURE_COORD_ARRAY); return; diff --git a/src/glamor_render.c b/src/glamor_render.c index 9bca747..b03b4c3 100644 --- a/src/glamor_render.c +++ b/src/glamor_render.c @@ -588,9 +588,6 @@ glamor_set_composite_texture(glamor_screen_private *glamor_priv, int unit, GL_LINEAR); break; } -#ifndef GLAMOR_GLES2 - dispatch->glEnable(GL_TEXTURE_2D); -#endif /* * GLES2 doesn't support RepeatNone. We need to fix it anyway. @@ -1447,12 +1444,6 @@ glamor_composite_with_shader(CARD8 op, dispatch->glDisableVertexAttribArray(GLAMOR_VERTEX_SOURCE); dispatch->glDisableVertexAttribArray(GLAMOR_VERTEX_MASK); dispatch->glDisable(GL_BLEND); -#ifndef GLAMOR_GLES2 - dispatch->glActiveTexture(GL_TEXTURE0); - dispatch->glDisable(GL_TEXTURE_2D); - dispatch->glActiveTexture(GL_TEXTURE1); - dispatch->glDisable(GL_TEXTURE_2D); -#endif DEBUGF("finish rendering.\n"); dispatch->glUseProgram(0); glamor_priv->state = RENDER_STATE; diff --git a/src/glamor_tile.c b/src/glamor_tile.c index 60486cf..3e3e553 100644 --- a/src/glamor_tile.c +++ b/src/glamor_tile.c @@ -150,9 +150,6 @@ _glamor_tile(PixmapPtr pixmap, PixmapPtr tile, GL_REPEAT); dispatch->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); -#ifndef GLAMOR_GLES2 - dispatch->glEnable(GL_TEXTURE_2D); -#endif glamor_set_repeat_normalize_tcoords (src_pixmap_priv, RepeatNormal, src_xscale, src_yscale, @@ -179,9 +176,6 @@ _glamor_tile(PixmapPtr pixmap, PixmapPtr tile, dispatch->glDrawArrays(GL_TRIANGLE_FAN, 0, 4); dispatch->glDisableVertexAttribArray(GLAMOR_VERTEX_SOURCE); -#ifndef GLAMOR_GLES2 - dispatch->glDisable(GL_TEXTURE_2D); -#endif dispatch->glDisableVertexAttribArray(GLAMOR_VERTEX_POS); dispatch->glUseProgram(0); glamor_put_dispatch(glamor_priv); diff --git a/src/glamor_trapezoid.c b/src/glamor_trapezoid.c index 76b3729..e1ca252 100644 --- a/src/glamor_trapezoid.c +++ b/src/glamor_trapezoid.c @@ -956,12 +956,6 @@ TRAPEZOID_RESET_GL: dispatch->glDisableVertexAttribArray(GLAMOR_VERTEX_SOURCE); dispatch->glDisableVertexAttribArray(GLAMOR_VERTEX_MASK); dispatch->glDisable(GL_BLEND); -#ifndef GLAMOR_GLES2 - dispatch->glActiveTexture(GL_TEXTURE0); - dispatch->glDisable(GL_TEXTURE_2D); - dispatch->glActiveTexture(GL_TEXTURE1); - dispatch->glDisable(GL_TEXTURE_2D); -#endif dispatch->glUseProgram(0); TRAPEZOID_OUT: -- cgit v1.2.3