[gtk+/gtk-3-16] x11/gl: Removing some more legacy GL calls
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-3-16] x11/gl: Removing some more legacy GL calls
- Date: Mon, 22 Jun 2015 12:05:30 +0000 (UTC)
commit 3258d5ba2e3e89d3305a2777a1b554112496f0db
Author: Niels Nesse <nnesse sonic net>
Date: Mon Mar 23 22:15:08 2015 +0000
x11/gl: Removing some more legacy GL calls
They are not required any more.
http://bugzilla.gnome.org/show_bug.cgi?id=746668
(cherry picked from commit 641e280311316d8aad6ea9050b8fdd181598e59d)
Signed-off-by: Emmanuele Bassi <ebassi gnome org>
gdk/x11/gdkglcontext-x11.c | 7 -------
1 files changed, 0 insertions(+), 7 deletions(-)
---
diff --git a/gdk/x11/gdkglcontext-x11.c b/gdk/x11/gdkglcontext-x11.c
index 7e39bb6..c86cbd5 100644
--- a/gdk/x11/gdkglcontext-x11.c
+++ b/gdk/x11/gdkglcontext-x11.c
@@ -468,10 +468,6 @@ gdk_x11_gl_context_texture_from_surface (GdkGLContext *paint_context,
glGenTextures (1, &texture_id);
glBindTexture (target, texture_id);
- /* 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);
glTexParameteri (target, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
@@ -535,9 +531,6 @@ gdk_x11_gl_context_texture_from_surface (GdkGLContext *paint_context,
glXReleaseTexImageEXT (glx_pixmap->display, glx_pixmap->drawable,
GLX_FRONT_LEFT_EXT);
- if (target != GL_TEXTURE_2D)
- glDisable (target);
-
glDeleteTextures (1, &texture_id);
glx_pixmap_destroy(glx_pixmap);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]