Redo of removing __driRegisterExtensions(). I accidentally undid the previous check in.

diff --git a/src/mesa/drivers/dri/fb/fb_dri.c b/src/mesa/drivers/dri/fb/fb_dri.c
index 3a388cebc1b212b03f3d6eafda192425705406a1..d5ea98b5be453cf012fc451c50b1f940efafb3e6 100644 (file)
--- a/src/mesa/drivers/dri/fb/fb_dri.c
+++ b/src/mesa/drivers/dri/fb/fb_dri.c
@@ -570,12 +570,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.
@@ -591,7 +585,6 @@ __driCreateScreen(struct DRIDriverRec *driver,
 }
 
 
-
 /**
  * \brief Establish the set of modes available for the display.
  *

diff --git a/src/mesa/drivers/dri/mach64/mach64_screen.c b/src/mesa/drivers/dri/mach64/mach64_screen.c
index b8115de81142452a5ef323c2b225795bc0a9ee28..ea4922eabe6b8db0b45860ca7955264b705a246c 100644 (file)
--- a/src/mesa/drivers/dri/mach64/mach64_screen.c
+++ b/src/mesa/drivers/dri/mach64/mach64_screen.c
@@ -426,31 +426,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,

diff --git a/src/mesa/drivers/dri/r128/r128_screen.c b/src/mesa/drivers/dri/r128/r128_screen.c
index 624d67f9ba510be0ee9eb9cc44507538aad51cb3..3b44229da23739442f7520c5d1bb6af9493fe6af 100644 (file)
--- a/src/mesa/drivers/dri/r128/r128_screen.c
+++ b/src/mesa/drivers/dri/r128/r128_screen.c
@@ -327,36 +327,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 9d92ce8dab9eb1329bca561b5074507977de586b..f7d25271fbad3ace1ceed4119d6f7a4d03b48219 100644 (file)
--- a/src/mesa/drivers/dri/x11/x11_dri.c
+++ b/src/mesa/drivers/dri/x11/x11_dri.c
@@ -442,11 +442,6 @@ static struct __DriverAPIRec x11API = {
    x11UnbindContext
 };
 
-void
-__driRegisterExtensions(void)
-{
-}
-
 /*
  * This is the bootstrap function for the driver.
  * The __driCreateScreen name is the symbol that libGL.so fetches.