From f7c9eafa856623d5ce72afb8b20b7ccbcc3e671d Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Thu, 28 Jul 2005 21:57:17 +0000 Subject: glxEnableExtension is a platform-specific function exported by the loader. Therefore, drivers should not require it to run. --- src/mesa/drivers/dri/mach64/mach64_screen.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'src/mesa/drivers/dri/mach64') diff --git a/src/mesa/drivers/dri/mach64/mach64_screen.c b/src/mesa/drivers/dri/mach64/mach64_screen.c index df1ed92fe7..e87c87c239 100644 --- a/src/mesa/drivers/dri/mach64/mach64_screen.c +++ b/src/mesa/drivers/dri/mach64/mach64_screen.c @@ -215,10 +215,6 @@ mach64CreateScreen( __DRIscreenPrivate *sPriv ) if ( MACH64_DEBUG & DEBUG_VERBOSE_DRI ) fprintf( stderr, "%s\n", __FUNCTION__ ); - if ( glx_enable_extension == NULL ) { - return NULL; - } - /* Allocate the private area */ mach64Screen = (mach64ScreenPtr) CALLOC( sizeof(*mach64Screen) ); if ( !mach64Screen ) return NULL; @@ -318,13 +314,15 @@ mach64CreateScreen( __DRIscreenPrivate *sPriv ) mach64Screen->driScreen = sPriv; - if ( mach64Screen->irq != 0 ) { - (*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 ( mach64Screen->irq != 0 ) { + (*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 mach64Screen; } -- cgit v1.2.3