From afab516f5f7405ae33a8185d48600816133e0150 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Mon, 5 Mar 2018 18:28:35 +0000 Subject: [PATCH] x11: 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 Acked-by: Ian Romanick Acked-by: Brian Paul Reviewed-by: Adam Jackson --- src/mesa/drivers/x11/fakeglx.c | 15 --------------- src/mesa/drivers/x11/glxapi.c | 16 ---------------- src/mesa/drivers/x11/glxapi.h | 3 --- 3 files changed, 34 deletions(-) diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c index c49178b9afa..233b6e254fe 100644 --- a/src/mesa/drivers/x11/fakeglx.c +++ b/src/mesa/drivers/x11/fakeglx.c @@ -2683,18 +2683,6 @@ Fake_glXAssociateDMPbufferSGIX(Display *dpy, GLXPbufferSGIX pbuffer, DMparams *p #endif -/*** GLX_SGIX_swap_group ***/ - -static void -Fake_glXJoinSwapGroupSGIX(Display *dpy, GLXDrawable drawable, GLXDrawable member) -{ - (void) dpy; - (void) drawable; - (void) member; -} - - - /*** GLX_SUN_get_transparent_index ***/ static Status @@ -2935,9 +2923,6 @@ _mesa_GetGLXDispatchTable(void) glx.AssociateDMPbufferSGIX = NULL; #endif - /*** GLX_SGIX_swap_group ***/ - glx.JoinSwapGroupSGIX = Fake_glXJoinSwapGroupSGIX; - /*** GLX_SUN_get_transparent_index ***/ glx.GetTransparentIndexSUN = Fake_glXGetTransparentIndexSUN; diff --git a/src/mesa/drivers/x11/glxapi.c b/src/mesa/drivers/x11/glxapi.c index 637c6ae3caf..f112c8ab090 100644 --- a/src/mesa/drivers/x11/glxapi.c +++ b/src/mesa/drivers/x11/glxapi.c @@ -910,19 +910,6 @@ glXAssociateDMPbufferSGIX(Display *dpy, GLXPbufferSGIX pbuffer, DMparams *params #endif -/*** GLX_SGIX_swap_group ***/ - -void PUBLIC -glXJoinSwapGroupSGIX(Display *dpy, GLXDrawable drawable, GLXDrawable member) -{ - struct _glxapi_table *t; - GET_DISPATCH(dpy, t); - if (!t) - return; - t->JoinSwapGroupSGIX(dpy, drawable, member); -} - - /*** GLX_SUN_get_transparent_index ***/ Status PUBLIC @@ -1177,9 +1164,6 @@ static struct name_address_pair GLX_functions[] = { { "glXAssociateDMPbufferSGIX", (__GLXextFuncPtr) glXAssociateDMPbufferSGIX }, #endif - /*** GLX_SGIX_swap_group ***/ - { "glXJoinSwapGroupSGIX", (__GLXextFuncPtr) glXJoinSwapGroupSGIX }, - /*** GLX_SUN_get_transparent_index ***/ { "glXGetTransparentIndexSUN", (__GLXextFuncPtr) glXGetTransparentIndexSUN }, diff --git a/src/mesa/drivers/x11/glxapi.h b/src/mesa/drivers/x11/glxapi.h index 4f3087cac7a..03af158afae 100644 --- a/src/mesa/drivers/x11/glxapi.h +++ b/src/mesa/drivers/x11/glxapi.h @@ -164,9 +164,6 @@ struct _glxapi_table { void *AssociciateDMPbufferSGIX; #endif - /*** GLX_SGIX_swap_group ***/ - void (*JoinSwapGroupSGIX)(Display *, GLXDrawable, GLXDrawable); - /*** GLX_SUN_get_transparent_index ***/ Status (*GetTransparentIndexSUN)(Display *, Window, Window, long *); -- 2.30.2