From ba3d643c49ce16f8dcddac56308588839c55bc87 Mon Sep 17 00:00:00 2001 From: Jon Smirl Date: Thu, 3 Jun 2004 01:56:07 +0000 Subject: [PATCH] kill __driRegisterExtensions(), none of the functions did anything --- include/GL/internal/dri_interface.h | 3 --- src/glx/mini/dri_util.h | 4 --- src/mesa/drivers/dri/fb/fb_dri.c | 6 ----- src/mesa/drivers/dri/mach64/mach64_screen.c | 26 ------------------ src/mesa/drivers/dri/r128/r128_screen.c | 30 --------------------- src/mesa/drivers/dri/x11/x11_dri.c | 5 ---- 6 files changed, 74 deletions(-) diff --git a/include/GL/internal/dri_interface.h b/include/GL/internal/dri_interface.h index c0cd128a9e9..079ff106baf 100644 --- a/include/GL/internal/dri_interface.h +++ b/include/GL/internal/dri_interface.h @@ -176,9 +176,6 @@ extern void * __driCreateNewScreen( __DRInativeDisplay *dpy, int scrn, __DRIscre extern void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc, int numConfigs, __GLXvisualConfig *config); -/** This is optionally implemented in each driver */ -extern void __driRegisterExtensions( void ); - #endif /* DRI_NEW_INTERFACE_ONLY */ diff --git a/src/glx/mini/dri_util.h b/src/glx/mini/dri_util.h index a3934da4b92..638bfa95243 100644 --- a/src/glx/mini/dri_util.h +++ b/src/glx/mini/dri_util.h @@ -524,8 +524,4 @@ driCalculateSwapUsage( __DRIdrawablePrivate *dPriv, extern int driCompareGLXAPIVersion( GLuint required_version ); -/** This is optionally implemented in each driver */ -extern void -__driRegisterExtensions( void ); - #endif /* _DRI_UTIL_H_ */ diff --git a/src/mesa/drivers/dri/fb/fb_dri.c b/src/mesa/drivers/dri/fb/fb_dri.c index 1d35be2c777..5b3fbd33d4d 100644 --- a/src/mesa/drivers/dri/fb/fb_dri.c +++ b/src/mesa/drivers/dri/fb/fb_dri.c @@ -578,12 +578,6 @@ static struct __DriverAPIRec fbAPI = { }; -void -__driRegisterExtensions( void ) -{ -} - - /* * This is the bootstrap function for the driver. * The __driCreateScreen name is the symbol that libGL.so fetches. diff --git a/src/mesa/drivers/dri/mach64/mach64_screen.c b/src/mesa/drivers/dri/mach64/mach64_screen.c index 8ec10ea1101..b11a1623dad 100644 --- a/src/mesa/drivers/dri/mach64/mach64_screen.c +++ b/src/mesa/drivers/dri/mach64/mach64_screen.c @@ -443,32 +443,6 @@ mach64InitDriver( __DRIscreenPrivate *driScreen ) return GL_TRUE; } -#ifndef _SOLO -/* This function is called by libGL.so as soon as libGL.so is loaded. - * This is where we register new extension functions with the dispatcher. - */ -void __driRegisterExtensions( void ) -{ -#if 0 - /* KW: This is handled differently in the other drivers, not sure - * what to do here. - */ - PFNGLXENABLEEXTENSIONPROC glx_enable_extension; - - if ( driCompareGLXAPIVersion( 20030317 ) >= 0 ) { - glx_enable_extension = (PFNGLXENABLEEXTENSIONPROC) - glXGetProcAddress( (const GLubyte *) "__glXEnableExtension" ); - - if ( glx_enable_extension != NULL ) { - glx_enable_extension( "GLX_SGI_swap_control", GL_FALSE ); - glx_enable_extension( "GLX_SGI_video_sync", GL_FALSE ); - glx_enable_extension( "GLX_MESA_swap_control", GL_FALSE ); - } - } -#endif -} -#endif - static struct __DriverAPIRec mach64API = { .InitDriver = mach64InitDriver, .DestroyScreen = mach64DestroyScreen, diff --git a/src/mesa/drivers/dri/r128/r128_screen.c b/src/mesa/drivers/dri/r128/r128_screen.c index 5825e95ef26..48a17ab172b 100644 --- a/src/mesa/drivers/dri/r128/r128_screen.c +++ b/src/mesa/drivers/dri/r128/r128_screen.c @@ -335,36 +335,6 @@ r128InitDriver( __DRIscreenPrivate *sPriv ) return GL_TRUE; } -#ifndef _SOLO -/** - * This function is called by libGL.so as soon as libGL.so is loaded. - * This is where we register new extension functions with the dispatcher. - * - * \todo This interface has been deprecated, so we should probably remove - * this function before the next XFree86 release. - */ -void __driRegisterExtensions( void ) -{ -#if 0 - /* KW: This is done slightly differently to the other drivers and - dri_interface.h doesn't seem to cope. - */ - PFNGLXENABLEEXTENSIONPROC - glx_enable_extension; - - if ( driCompareGLXAPIVersion( 20030317 ) >= 0 ) { - glx_enable_extension = (PFNGLXENABLEEXTENSIONPROC) - glXGetProcAddress( (const GLubyte *) "__glXEnableExtension" ); - - if ( glx_enable_extension != NULL ) { - glx_enable_extension( "GLX_SGI_swap_control", GL_FALSE ); - glx_enable_extension( "GLX_SGI_video_sync", GL_FALSE ); - glx_enable_extension( "GLX_MESA_swap_control", GL_FALSE ); - } - } -#endif -} -#endif static struct __DriverAPIRec r128API = { .InitDriver = r128InitDriver, diff --git a/src/mesa/drivers/dri/x11/x11_dri.c b/src/mesa/drivers/dri/x11/x11_dri.c index 5ea3f1a1c45..cc307b0cc4b 100644 --- a/src/mesa/drivers/dri/x11/x11_dri.c +++ b/src/mesa/drivers/dri/x11/x11_dri.c @@ -450,11 +450,6 @@ static struct __DriverAPIRec x11API = { x11OpenCloseFullScreen }; -void -__driRegisterExtensions(void) -{ -} - /* * This is the bootstrap function for the driver. * The __driCreateScreen name is the symbol that libGL.so fetches. -- 2.30.2