From 742b8e33012b87bfb68749f185294860637fc316 Mon Sep 17 00:00:00 2001
From: Emil Velikov <emil.velikov@collabora.com>
Date: Mon, 5 Mar 2018 18:25:16 +0000
Subject: [PATCH] glx: remove empty GLX_SGIX_swap_barrier 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>
---
 src/glx/apple/glx_empty.c | 21 ---------------------
 src/glx/glxcmds.c         | 25 -------------------------
 src/glx/glxextensions.c   |  1 -
 src/glx/glxextensions.h   |  1 -
 4 files changed, 48 deletions(-)

diff --git a/src/glx/apple/glx_empty.c b/src/glx/apple/glx_empty.c
index 33fffb5f61c..427c3a59356 100644
--- a/src/glx/apple/glx_empty.c
+++ b/src/glx/apple/glx_empty.c
@@ -61,27 +61,6 @@ glXJoinSwapGroupSGIX(Display * dpy, GLXDrawable drawable, GLXDrawable member)
 }
 
 
-/*
-** GLX_SGIX_swap_barrier
-*/
-void
-glXBindSwapBarrierSGIX(Display * dpy, GLXDrawable drawable, int barrier)
-{
-   (void) dpy;
-   (void) drawable;
-   (void) barrier;
-}
-
-Bool
-glXQueryMaxSwapBarriersSGIX(Display * dpy, int screen, int *max)
-{
-   (void) dpy;
-   (void) screen;
-   (void) max;
-   return False;
-}
-
-
 /*
 ** GLX_OML_sync_control
 */
diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
index 943b81754f3..57af039d1be 100644
--- a/src/glx/glxcmds.c
+++ b/src/glx/glxcmds.c
@@ -2049,27 +2049,6 @@ __glXJoinSwapGroupSGIX(Display * dpy, GLXDrawable drawable,
 }
 
 
-/*
-** GLX_SGIX_swap_barrier
-*/
-static void
-__glXBindSwapBarrierSGIX(Display * dpy, GLXDrawable drawable, int barrier)
-{
-   (void) dpy;
-   (void) drawable;
-   (void) barrier;
-}
-
-static Bool
-__glXQueryMaxSwapBarriersSGIX(Display * dpy, int screen, int *max)
-{
-   (void) dpy;
-   (void) screen;
-   (void) max;
-   return False;
-}
-
-
 /*
 ** GLX_OML_sync_control
 */
@@ -2544,10 +2523,6 @@ static const struct name_address_pair GLX_functions[] = {
    /*** GLX_SGIX_swap_group ***/
    GLX_FUNCTION2(glXJoinSwapGroupSGIX, __glXJoinSwapGroupSGIX),
 
-   /*** GLX_SGIX_swap_barrier ***/
-   GLX_FUNCTION2(glXBindSwapBarrierSGIX, __glXBindSwapBarrierSGIX),
-   GLX_FUNCTION2(glXQueryMaxSwapBarriersSGIX, __glXQueryMaxSwapBarriersSGIX),
-
    /*** GLX_MESA_copy_sub_buffer ***/
    GLX_FUNCTION2(glXCopySubBufferMESA, __glXCopySubBufferMESA),
 
diff --git a/src/glx/glxextensions.c b/src/glx/glxextensions.c
index af6ffbf6600..de015f25464 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_barrier),           VER(0,0), N, N, 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 },
diff --git a/src/glx/glxextensions.h b/src/glx/glxextensions.h
index d73128bd0ea..0af28a2dde1 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_barrier_bit,
    SGIX_swap_group_bit,
    SGIX_visual_select_group_bit,
    SGI_make_current_read_bit,
-- 
2.30.2