Mesa (master): glx: remove empty GLX_SGIX_swap_barrier stubs
Emil Velikov
evelikov at kemper.freedesktop.org
Mon Mar 12 14:55:02 UTC 2018
Module: Mesa
Branch: master
Commit: 742b8e33012b87bfb68749f185294860637fc316
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=742b8e33012b87bfb68749f185294860637fc316
Author: Emil Velikov <emil.velikov at collabora.com>
Date: Mon Mar 5 18:25:16 2018 +0000
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 at collabora.com>
Acked-by: Ian Romanick <ian.d.romanick at intel.com>
Acked-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Adam Jackson <ajax at 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 33fffb5f61..427c3a5935 100644
--- a/src/glx/apple/glx_empty.c
+++ b/src/glx/apple/glx_empty.c
@@ -62,27 +62,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
*/
Bool
diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
index 943b81754f..57af039d1b 100644
--- a/src/glx/glxcmds.c
+++ b/src/glx/glxcmds.c
@@ -2050,27 +2050,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
*/
static Bool
@@ -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 af6ffbf660..de015f2546 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 d73128bd0e..0af28a2dde 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,
More information about the mesa-commit
mailing list