diff options
| author | Ian Romanick <idr@us.ibm.com> | 2005-07-28 21:57:17 +0000 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2005-07-28 21:57:17 +0000 |
| commit | f7c9eafa856623d5ce72afb8b20b7ccbcc3e671d (patch) | |
| tree | eae60a4cd586b0044edd787c5c11e3e8ea70fcd8 /src/mesa/drivers/dri/mach64 | |
| parent | 68679d2b9e526a351c37c89c78ec50e36f2c9087 (diff) | |
glxEnableExtension is a platform-specific function exported by the loader.
Therefore, drivers should not require it to run.
Diffstat (limited to 'src/mesa/drivers/dri/mach64')
| -rw-r--r-- | src/mesa/drivers/dri/mach64/mach64_screen.c | 18 |
1 files changed, 8 insertions, 10 deletions
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; } |