summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmil Velikov <emil.velikov@collabora.com>2016-04-25 12:07:45 +0100
committerEmil Velikov <emil.l.velikov@gmail.com>2016-04-25 14:41:13 +0100
commit8cdde773f3aed4dfddec7783d5c705bec5ac2647 (patch)
treedff93c07bdb9935dcdc45e2abec043905a8b6d9e
parent6ee29f77d692ebe38c1b6434e67d417b6b0814f2 (diff)
glx/glvnd: unconditionally build the GLX_SGI extensions dispatch
Namely: GLX_SGI_swap_control and GLX_SGI_video_sync Mesa has supported the extensions for a long while. If any other implementation does not, having the dispatch won't cause any harm as the extensions won't be listed in the extension string, thus the user will never execute them. Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
-rw-r--r--src/glx/g_glxglvnddispatchfuncs.c12
-rw-r--r--src/glx/g_glxglvnddispatchindices.h6
2 files changed, 0 insertions, 18 deletions
diff --git a/src/glx/g_glxglvnddispatchfuncs.c b/src/glx/g_glxglvnddispatchfuncs.c
index 4ed0975704c..72f0f68bf39 100644
--- a/src/glx/g_glxglvnddispatchfuncs.c
+++ b/src/glx/g_glxglvnddispatchfuncs.c
@@ -55,9 +55,7 @@ const char * const __glXDispatchTableStrings[DI_LAST_INDEX] = {
// glXGetProcAddressARB implemented by libglvnd
// glXGetSelectedEvent implemented by libglvnd
__ATTRIB(GetSelectedEventSGIX),
-#if defined(GLX_SGI_video_sync)
__ATTRIB(GetVideoSyncSGI),
-#endif // defined(GLX_SGI_video_sync)
// glXGetVisualFromFBConfig implemented by libglvnd
__ATTRIB(GetVisualFromFBConfigSGIX),
// glXImportContextEXT implemented by libglvnd
@@ -76,14 +74,10 @@ const char * const __glXDispatchTableStrings[DI_LAST_INDEX] = {
// glXSelectEvent implemented by libglvnd
__ATTRIB(SelectEventSGIX),
// glXSwapBuffers implemented by libglvnd
-#if defined(GLX_SGI_swap_control)
__ATTRIB(SwapIntervalSGI),
-#endif // defined(GLX_SGI_swap_control)
// glXUseXFont implemented by libglvnd
// glXWaitGL implemented by libglvnd
-#if defined(GLX_SGI_video_sync)
__ATTRIB(WaitVideoSyncSGI),
-#endif // defined(GLX_SGI_video_sync)
// glXWaitX implemented by libglvnd
__ATTRIB(glXBindSwapBarrierSGIX),
@@ -404,7 +398,6 @@ static void dispatch_GetSelectedEventSGIX(Display *dpy, GLXDrawable drawable,
-#if defined(GLX_SGI_video_sync)
static int dispatch_GetVideoSyncSGI(unsigned int *count)
{
PFNGLXGETVIDEOSYNCSGIPROC pGetVideoSyncSGI;
@@ -423,7 +416,6 @@ static int dispatch_GetVideoSyncSGI(unsigned int *count)
return (*pGetVideoSyncSGI)(count);
}
-#endif // defined(GLX_SGI_video_sync)
@@ -522,7 +514,6 @@ static void dispatch_SelectEventSGIX(Display *dpy, GLXDrawable drawable,
-#if defined(GLX_SGI_swap_control)
static int dispatch_SwapIntervalSGI(int interval)
{
PFNGLXSWAPINTERVALSGIPROC pSwapIntervalSGI;
@@ -541,11 +532,9 @@ static int dispatch_SwapIntervalSGI(int interval)
return (*pSwapIntervalSGI)(interval);
}
-#endif // defined(GLX_SGI_swap_control)
-#if defined(GLX_SGI_video_sync)
static int dispatch_WaitVideoSyncSGI(int divisor, int remainder,
unsigned int *count)
{
@@ -565,7 +554,6 @@ static int dispatch_WaitVideoSyncSGI(int divisor, int remainder,
return (*pWaitVideoSyncSGI)(divisor, remainder, count);
}
-#endif // defined(GLX_SGI_video_sync)
diff --git a/src/glx/g_glxglvnddispatchindices.h b/src/glx/g_glxglvnddispatchindices.h
index b48ac33dbc4..fd2156e56e1 100644
--- a/src/glx/g_glxglvnddispatchindices.h
+++ b/src/glx/g_glxglvnddispatchindices.h
@@ -44,9 +44,7 @@ typedef enum __GLXdispatchIndex {
// GetProcAddressARB implemented by libglvnd
// GetSelectedEvent implemented by libglvnd
DI_GetSelectedEventSGIX,
-#if defined(GLX_SGI_video_sync)
DI_GetVideoSyncSGI,
-#endif // defined(GLX_SGI_video_sync)
// GetVisualFromFBConfig implemented by libglvnd
DI_GetVisualFromFBConfigSGIX,
// ImportContextEXT implemented by libglvnd
@@ -65,14 +63,10 @@ typedef enum __GLXdispatchIndex {
// SelectEvent implemented by libglvnd
DI_SelectEventSGIX,
// SwapBuffers implemented by libglvnd
-#if defined(GLX_SGI_swap_control)
DI_SwapIntervalSGI,
-#endif // defined(GLX_SGI_swap_control)
// UseXFont implemented by libglvnd
// WaitGL implemented by libglvnd
-#if defined(GLX_SGI_video_sync)
DI_WaitVideoSyncSGI,
-#endif // defined(GLX_SGI_video_sync)
// WaitX implemented by libglvnd
DI_glXBindSwapBarrierSGIX,
DI_glXCopySubBufferMESA,