glxEnableExtension is a platform-specific function exported by the loader.

Therefore, drivers should not require it to run.

1 files changed, 8 insertions, 11 deletions

diff --git a/src/mesa/drivers/dri/unichrome/via_screen.c b/src/mesa/drivers/dri/unichrome/via_screen.c
index 2ae2322f8ac..b718fd446ab 100644
--- a/src/mesa/drivers/dri/unichrome/via_screen.c
+++ b/src/mesa/drivers/dri/unichrome/via_screen.c
@@ -102,11 +102,6 @@ viaInitDriver(__DRIscreenPrivate *sPriv)
     void * const psc = sPriv->psc->screenConfigs;
 
 
-    if ( glx_enable_extension == NULL ) {
-	return GL_FALSE;
-    }
-
-
     /* Allocate the private area */
     viaScreen = (viaScreenPrivate *) CALLOC(sizeof(viaScreenPrivate));
     if (!viaScreen) {
@@ -175,13 +170,15 @@ viaInitDriver(__DRIscreenPrivate *sPriv)
 
     viaScreen->sareaPrivOffset = gDRIPriv->sarea_priv_offset;
 
-    if ( viaScreen->irqEnabled ) {
-	(*glx_enable_extension)( psc, "GLX_SGI_swap_control" );
-	(*glx_enable_extension)( psc, "GLX_SGI_video_sync" );
-	(*glx_enable_extension)( psc, "GLX_MESA_swap_control" );
-    }
+    if ( glx_enable_extension == NULL ) {
+       if ( viaScreen->irqEnabled ) {
+	  (*glx_enable_extension)( psc, "GLX_SGI_swap_control" );
+	  (*glx_enable_extension)( psc, "GLX_SGI_video_sync" );
+	  (*glx_enable_extension)( psc, "GLX_MESA_swap_control" );
+       }
 
-    (*glx_enable_extension)( psc, "GLX_MESA_swap_frame_usage" );
+       (*glx_enable_extension)( psc, "GLX_MESA_swap_frame_usage" );
+    }
 
     return GL_TRUE;
 }