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/mga/mga_xmesa.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'src/mesa/drivers/dri/mga') diff --git a/src/mesa/drivers/dri/mga/mga_xmesa.c b/src/mesa/drivers/dri/mga/mga_xmesa.c index ef080b5695a..cf3db99b937 100644 --- a/src/mesa/drivers/dri/mga/mga_xmesa.c +++ b/src/mesa/drivers/dri/mga/mga_xmesa.c @@ -201,10 +201,6 @@ mgaInitDriver(__DRIscreenPrivate *sPriv) void * const psc = sPriv->psc->screenConfigs; - if ( glx_enable_extension == NULL ) { - return GL_FALSE; - } - /* Allocate the private area */ mgaScreen = (mgaScreenPrivate *)MALLOC(sizeof(mgaScreenPrivate)); if (!mgaScreen) { @@ -233,11 +229,13 @@ mgaInitDriver(__DRIscreenPrivate *sPriv) } } - (*glx_enable_extension)( psc, "GLX_MESA_swap_control" ); - (*glx_enable_extension)( psc, "GLX_MESA_swap_frame_usage" ); - (*glx_enable_extension)( psc, "GLX_SGI_make_current_read" ); - (*glx_enable_extension)( psc, "GLX_SGI_swap_control" ); - (*glx_enable_extension)( psc, "GLX_SGI_video_sync" ); + if ( glx_enable_extension == NULL ) { + (*glx_enable_extension)( psc, "GLX_MESA_swap_control" ); + (*glx_enable_extension)( psc, "GLX_MESA_swap_frame_usage" ); + (*glx_enable_extension)( psc, "GLX_SGI_make_current_read" ); + (*glx_enable_extension)( psc, "GLX_SGI_swap_control" ); + (*glx_enable_extension)( psc, "GLX_SGI_video_sync" ); + } if (serverInfo->chipset != MGA_CARD_TYPE_G200 && serverInfo->chipset != MGA_CARD_TYPE_G400) { -- cgit v1.2.3