diff options
Diffstat (limited to 'src/mesa/drivers/dri/r200/r200_screen.c')
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_screen.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_screen.c b/src/mesa/drivers/dri/r200/r200_screen.c index f0e09d5fc4..e68f7dae8a 100644 --- a/src/mesa/drivers/dri/r200/r200_screen.c +++ b/src/mesa/drivers/dri/r200/r200_screen.c @@ -240,10 +240,6 @@ r200CreateScreen( __DRIscreenPrivate *sPriv ) void * const psc = sPriv->psc->screenConfigs; - if ( glx_enable_extension == NULL ) { - return NULL; - } - /* Allocate the private area */ screen = (r200ScreenPtr) CALLOC( sizeof(*screen) ); if ( !screen ) { @@ -467,20 +463,21 @@ r200CreateScreen( __DRIscreenPrivate *sPriv ) screen->driScreen = sPriv; screen->sarea_priv_offset = dri_priv->sarea_priv_offset; - if ( screen->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 ( screen->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" ); + (*glx_enable_extension)( psc, "GLX_MESA_allocate_memory" ); + } sPriv->psc->allocateMemory = (void *) r200AllocateMemoryMESA; sPriv->psc->freeMemory = (void *) r200FreeMemoryMESA; sPriv->psc->memoryOffset = (void *) r200GetMemoryOffsetMESA; - (*glx_enable_extension)( psc, "GLX_MESA_allocate_memory" ); - return screen; } |