[gtk/wip/otte/gleanup: 27/53] x11: Remove glx version check
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/otte/gleanup: 27/53] x11: Remove glx version check
- Date: Tue, 13 Jul 2021 03:35:05 +0000 (UTC)
commit 4b7085a3ef75f05258095aba4c8009c2a9b96b70
Author: Benjamin Otte <otte redhat com>
Date: Tue Jun 29 18:45:04 2021 +0200
x11: Remove glx version check
We only work with GLX >= 1.3 anyway, so don't explicitly check for it
and pretend to do something else that doesn't work otherwise.
gdk/x11/gdkglcontext-glx.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
---
diff --git a/gdk/x11/gdkglcontext-glx.c b/gdk/x11/gdkglcontext-glx.c
index 80bb0ac801..a8c0eaf013 100644
--- a/gdk/x11/gdkglcontext-glx.c
+++ b/gdk/x11/gdkglcontext-glx.c
@@ -627,13 +627,10 @@ gdk_x11_gl_context_glx_realize (GdkGLContext *context,
&attrs);
XMapWindow(dpy, info->dummy_xwin);
- if (display_x11->glx_version >= 13)
- {
- info->glx_drawable = glXCreateWindow (dpy, context_glx->glx_config,
- gdk_x11_surface_get_xid (surface),
- NULL);
- info->dummy_glx = glXCreateWindow (dpy, context_glx->glx_config, info->dummy_xwin, NULL);
- }
+ info->glx_drawable = glXCreateWindow (dpy, context_glx->glx_config,
+ gdk_x11_surface_get_xid (surface),
+ NULL);
+ info->dummy_glx = glXCreateWindow (dpy, context_glx->glx_config, info->dummy_xwin, NULL);
if (gdk_x11_display_error_trap_pop (display))
{
@@ -654,8 +651,8 @@ gdk_x11_gl_context_glx_realize (GdkGLContext *context,
XFree (xvisinfo);
- context_glx->attached_drawable = info->glx_drawable ? info->glx_drawable : gdk_x11_surface_get_xid
(surface);
- context_glx->unattached_drawable = info->dummy_glx ? info->dummy_glx : info->dummy_xwin;
+ context_glx->attached_drawable = info->glx_drawable;
+ context_glx->unattached_drawable = info->dummy_glx;
GDK_DISPLAY_NOTE (display, OPENGL,
g_message ("Realized GLX context[%p], %s, version: %d.%d",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]