glx: Collect all the non-applegl extensions in the GetProcAddress table
No functional change, just reducing #ifdef clutter.
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6671>
diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
index 1cbe762..60b1e86 100644
--- a/src/glx/glxcmds.c
+++ b/src/glx/glxcmds.c
@@ -2464,6 +2464,20 @@
GLX_FUNCTION(glXQueryDrawable),
GLX_FUNCTION(glXSelectEvent),
+ /*** GLX_SGIX_fbconfig ***/
+ GLX_FUNCTION2(glXGetFBConfigAttribSGIX, glXGetFBConfigAttrib),
+ GLX_FUNCTION2(glXChooseFBConfigSGIX, glXChooseFBConfig),
+ GLX_FUNCTION(glXCreateGLXPixmapWithConfigSGIX),
+ GLX_FUNCTION(glXCreateContextWithConfigSGIX),
+ GLX_FUNCTION2(glXGetVisualFromFBConfigSGIX, glXGetVisualFromFBConfig),
+ GLX_FUNCTION(glXGetFBConfigFromVisualSGIX),
+
+ /*** GLX_ARB_get_proc_address ***/
+ GLX_FUNCTION(glXGetProcAddressARB),
+
+ /*** GLX 1.4 ***/
+ GLX_FUNCTION2(glXGetProcAddress, glXGetProcAddressARB),
+
#ifndef GLX_USE_APPLEGL
/*** GLX_SGI_swap_control ***/
GLX_FUNCTION(glXSwapIntervalSGI),
@@ -2482,17 +2496,7 @@
GLX_FUNCTION2(glXGetCurrentDisplayEXT, glXGetCurrentDisplay),
GLX_FUNCTION(glXImportContextEXT),
GLX_FUNCTION2(glXQueryContextInfoEXT, glXQueryContext),
-#endif
- /*** GLX_SGIX_fbconfig ***/
- GLX_FUNCTION2(glXGetFBConfigAttribSGIX, glXGetFBConfigAttrib),
- GLX_FUNCTION2(glXChooseFBConfigSGIX, glXChooseFBConfig),
- GLX_FUNCTION(glXCreateGLXPixmapWithConfigSGIX),
- GLX_FUNCTION(glXCreateContextWithConfigSGIX),
- GLX_FUNCTION2(glXGetVisualFromFBConfigSGIX, glXGetVisualFromFBConfig),
- GLX_FUNCTION(glXGetFBConfigFromVisualSGIX),
-
-#ifndef GLX_USE_APPLEGL
/*** GLX_SGIX_pbuffer ***/
GLX_FUNCTION(glXCreateGLXPbufferSGIX),
GLX_FUNCTION(glXDestroyGLXPbufferSGIX),
@@ -2512,15 +2516,7 @@
/*** GLX_MESA_swap_control ***/
GLX_FUNCTION(glXSwapIntervalMESA),
GLX_FUNCTION(glXGetSwapIntervalMESA),
-#endif
- /*** GLX_ARB_get_proc_address ***/
- GLX_FUNCTION(glXGetProcAddressARB),
-
- /*** GLX 1.4 ***/
- GLX_FUNCTION2(glXGetProcAddress, glXGetProcAddressARB),
-
-#ifndef GLX_USE_APPLEGL
/*** GLX_OML_sync_control ***/
GLX_FUNCTION(glXWaitForSbcOML),
GLX_FUNCTION(glXWaitForMscOML),