Open/Close FullScreen die. unichrome and savage implemented, code is ifdef'd out

1 files changed, 27 insertions, 20 deletions

diff --git a/src/mesa/drivers/dri/mach64/mach64_screen.c b/src/mesa/drivers/dri/mach64/mach64_screen.c
index b11a1623dad..b8115de8114 100644
--- a/src/mesa/drivers/dri/mach64/mach64_screen.c
+++ b/src/mesa/drivers/dri/mach64/mach64_screen.c
@@ -26,7 +26,7 @@
  * Authors:
  *	Gareth Hughes <[email protected]>
  *	Leif Delgass <[email protected]>
- *	Jos� Fonseca <[email protected]>
+ *	Jos�Fonseca <[email protected]>
  */
 
 #include "mach64_context.h"
@@ -359,23 +359,6 @@ mach64DestroyScreen( __DRIscreenPrivate *driScreen )
    driScreen->private = NULL;
 }
 
-/* Initialize the fullscreen mode.
- */
-static GLboolean
-mach64OpenFullScreen( __DRIcontextPrivate *driContextPriv )
-{
-   return GL_TRUE;
-}
-
-/* Shut down the fullscreen mode.
- */
-static GLboolean
-mach64CloseFullScreen( __DRIcontextPrivate *driContextPriv )
-{
-   return GL_TRUE;
-}
-
-
 /* Create and initialize the Mesa and driver specific pixmap buffer
  * data.
  */
@@ -443,6 +426,32 @@ 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,
@@ -453,8 +462,6 @@ static struct __DriverAPIRec mach64API = {
    .SwapBuffers     = mach64SwapBuffers,
    .MakeCurrent     = mach64MakeCurrent,
    .UnbindContext   = mach64UnbindContext,
-   .OpenFullScreen  = mach64OpenFullScreen,
-   .CloseFullScreen = mach64CloseFullScreen,
    .GetSwapInfo     = NULL,
    .GetMSC          = driGetMSC32,
    .WaitForMSC      = driWaitForMSC32,