diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2015-03-23 22:03:00 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2015-03-23 22:03:00 +0000 |
| commit | 6bd7526ee78828b99bb52cd01f5e43481fb4b995 (patch) | |
| tree | bd2c5fbdedd5c5f673d7aff7f7c11ab283d897af | |
| parent | aaff396e48c21287122d27ffa5b34a59d36288be (diff) | |
| download | gtk+-6bd7526ee78828b99bb52cd01f5e43481fb4b995.tar.gz | |
x11/gl: Do not call glEnable/glDisable with GL_TEXTURE_2D
These are fixed pipeline functions, and Mesa will warn (if debugging
messages are enabled). At best, they are poinless calls.
| -rw-r--r-- | gdk/x11/gdkglcontext-x11.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gdk/x11/gdkglcontext-x11.c b/gdk/x11/gdkglcontext-x11.c index e2d70e9b73..82f50710d7 100644 --- a/gdk/x11/gdkglcontext-x11.c +++ b/gdk/x11/gdkglcontext-x11.c @@ -461,7 +461,10 @@ gdk_x11_gl_context_texture_from_surface (GdkGLContext *paint_context, glGenTextures (1, &texture_id); glBindTexture (target, texture_id); - glEnable (target); + + /* glEnable(GL_TEXTURE_2D) is deprecated */ + if (target != GL_TEXTURE_2D) + glEnable (target); glTexParameteri (target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); glTexParameteri (target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); @@ -526,7 +529,9 @@ gdk_x11_gl_context_texture_from_surface (GdkGLContext *paint_context, glXReleaseTexImageEXT (glx_pixmap->display, glx_pixmap->drawable, GLX_FRONT_LEFT_EXT); - glDisable (target); + if (target != GL_TEXTURE_2D) + glDisable (target); + glDeleteTextures (1, &texture_id); glx_pixmap_destroy(glx_pixmap); |