From: Emil Velikov <emil.velikov@collabora.com>
Date: Mon, 5 Mar 2018 18:33:14 +0000 (+0000)
Subject: glx: remove empty GLX_SGIX_swap_group stubs
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5ef608fab7d45163e72c41672817d2b9837dac78;p=mesa.git

glx: remove empty GLX_SGIX_swap_group stubs

The extension was never implemented. Quick search suggests:
 - no actual users (on my Arch setup)
 - the Nvidia driver does not implement the extension

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Acked-by: Ian Romanick <ian.d.romanick@intel.com>
Acked-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
---

diff --git a/src/glx/apple/glx_empty.c b/src/glx/apple/glx_empty.c
index 427c3a59356..b7afbce7dd5 100644
--- a/src/glx/apple/glx_empty.c
+++ b/src/glx/apple/glx_empty.c
@@ -49,18 +49,6 @@ glXWaitVideoSyncSGI(int divisor, int remainder, unsigned int *count)
 }
 
 
-/*
-** GLX_SGIX_swap_group
-*/
-void
-glXJoinSwapGroupSGIX(Display * dpy, GLXDrawable drawable, GLXDrawable member)
-{
-   (void) dpy;
-   (void) drawable;
-   (void) member;
-}
-
-
 /*
 ** GLX_OML_sync_control
 */
diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
index 57af039d1be..949c2a59314 100644
--- a/src/glx/glxcmds.c
+++ b/src/glx/glxcmds.c
@@ -2036,19 +2036,6 @@ glXGetFBConfigFromVisualSGIX(Display * dpy, XVisualInfo * vis)
 }
 
 #ifndef GLX_USE_APPLEGL
-/*
-** GLX_SGIX_swap_group
-*/
-static void
-__glXJoinSwapGroupSGIX(Display * dpy, GLXDrawable drawable,
-                       GLXDrawable member)
-{
-   (void) dpy;
-   (void) drawable;
-   (void) member;
-}
-
-
 /*
 ** GLX_OML_sync_control
 */
@@ -2520,9 +2507,6 @@ static const struct name_address_pair GLX_functions[] = {
    GLX_FUNCTION(glXSelectEventSGIX),
    GLX_FUNCTION(glXGetSelectedEventSGIX),
 
-   /*** GLX_SGIX_swap_group ***/
-   GLX_FUNCTION2(glXJoinSwapGroupSGIX, __glXJoinSwapGroupSGIX),
-
    /*** GLX_MESA_copy_sub_buffer ***/
    GLX_FUNCTION2(glXCopySubBufferMESA, __glXCopySubBufferMESA),
 
diff --git a/src/glx/glxextensions.c b/src/glx/glxextensions.c
index de015f25464..a575862670f 100644
--- a/src/glx/glxextensions.c
+++ b/src/glx/glxextensions.c
@@ -161,7 +161,6 @@ static const struct extension_info known_glx_extensions[] = {
    { GLX(SGIS_multisample),            VER(0,0), Y, Y, N, N },
    { GLX(SGIX_fbconfig),               VER(1,3), Y, Y, N, N },
    { GLX(SGIX_pbuffer),                VER(1,3), Y, Y, N, N },
-   { GLX(SGIX_swap_group),             VER(0,0), N, N, N, N },
    { GLX(SGIX_visual_select_group),    VER(0,0), Y, Y, N, N },
    { GLX(SGI_make_current_read),       VER(1,3), Y, N, N, N },
    { GLX(SGI_swap_control),            VER(0,0), Y, N, N, N },
diff --git a/src/glx/glxextensions.h b/src/glx/glxextensions.h
index 0af28a2dde1..c6428d46b4d 100644
--- a/src/glx/glxextensions.h
+++ b/src/glx/glxextensions.h
@@ -67,7 +67,6 @@ enum
    SGIS_multisample_bit,
    SGIX_fbconfig_bit,
    SGIX_pbuffer_bit,
-   SGIX_swap_group_bit,
    SGIX_visual_select_group_bit,
    SGI_make_current_read_bit,
    SGI_swap_control_bit,