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/r128/r128_screen.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'src/mesa/drivers/dri/r128/r128_screen.c') diff --git a/src/mesa/drivers/dri/r128/r128_screen.c b/src/mesa/drivers/dri/r128/r128_screen.c index b6177bf691..c1ec8cf621 100644 --- a/src/mesa/drivers/dri/r128/r128_screen.c +++ b/src/mesa/drivers/dri/r128/r128_screen.c @@ -103,10 +103,6 @@ r128CreateScreen( __DRIscreenPrivate *sPriv ) void * const psc = sPriv->psc->screenConfigs; - if ( glx_enable_extension == NULL ) { - return NULL; - } - /* Allocate the private area */ r128Screen = (r128ScreenPtr) CALLOC( sizeof(*r128Screen) ); if ( !r128Screen ) return NULL; @@ -218,13 +214,15 @@ r128CreateScreen( __DRIscreenPrivate *sPriv ) r128Screen->driScreen = sPriv; - if ( r128Screen->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 ( r128Screen->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 r128Screen; } -- cgit v1.2.3