[gtk/wip/otte/gleanup: 168/182] x11: Do not call glXQueryExtension()




commit d460dc40fafb7c1b5342109e773ab1ed8fd7c625
Author: Benjamin Otte <otte redhat com>
Date:   Fri Jul 2 02:33:18 2021 +0200

    x11: Do not call glXQueryExtension()
    
    epoxy does that already.

 gdk/x11/gdkdisplay-x11.h   | 2 --
 gdk/x11/gdkglcontext-glx.c | 6 ------
 2 files changed, 8 deletions(-)
---
diff --git a/gdk/x11/gdkdisplay-x11.h b/gdk/x11/gdkdisplay-x11.h
index 4f27d28f09..3e76962f3a 100644
--- a/gdk/x11/gdkdisplay-x11.h
+++ b/gdk/x11/gdkdisplay-x11.h
@@ -134,8 +134,6 @@ struct _GdkX11Display
   /* GLX information */
   /* GLXFBConfig */ gpointer glx_config;
   int glx_version;
-  int glx_error_base;
-  int glx_event_base;
 
   /* EGL information */
   /* We use gpointer here so we don't have to pull in EGL headers (which glx doesn't like) */
diff --git a/gdk/x11/gdkglcontext-glx.c b/gdk/x11/gdkglcontext-glx.c
index 5d8708ab91..ebf101341c 100644
--- a/gdk/x11/gdkglcontext-glx.c
+++ b/gdk/x11/gdkglcontext-glx.c
@@ -955,7 +955,6 @@ gdk_x11_display_init_glx (GdkX11Display  *display_x11,
 {
   GdkDisplay *display = GDK_DISPLAY (display_x11);
   Display *dpy;
-  int error_base, event_base;
   int screen_num;
 
   dpy = gdk_x11_display_get_xdisplay (display);
@@ -963,14 +962,9 @@ gdk_x11_display_init_glx (GdkX11Display  *display_x11,
   if (!epoxy_has_glx (dpy))
     return FALSE;
 
-  if (!glXQueryExtension (dpy, &error_base, &event_base))
-    return FALSE;
-
   screen_num = display_x11->screen->screen_num;
 
   display_x11->glx_version = epoxy_glx_version (dpy, screen_num);
-  display_x11->glx_error_base = error_base;
-  display_x11->glx_event_base = event_base;
 
   display_x11->has_glx_create_context =
     epoxy_has_glx_extension (dpy, screen_num, "GLX_ARB_create_context_profile");


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]