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/r300 | |
| 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/r300')
| -rw-r--r-- | src/mesa/drivers/dri/r300/radeon_screen.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/mesa/drivers/dri/r300/radeon_screen.c b/src/mesa/drivers/dri/r300/radeon_screen.c index 18919ddeb1..466e6b0409 100644 --- a/src/mesa/drivers/dri/r300/radeon_screen.c +++ b/src/mesa/drivers/dri/r300/radeon_screen.c @@ -316,10 +316,6 @@ static radeonScreenPtr radeonCreateScreen(__DRIscreenPrivate * sPriv) void *const psc = sPriv->psc->screenConfigs; - if (glx_enable_extension == NULL) { - return NULL; - } - /* Allocate the private area */ screen = (radeonScreenPtr) CALLOC(sizeof(*screen)); if (!screen) { @@ -586,20 +582,24 @@ static radeonScreenPtr radeonCreateScreen(__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"); + } #if R200_MERGED sPriv->psc->allocateMemory = (void *)r200AllocateMemoryMESA; sPriv->psc->freeMemory = (void *)r200FreeMemoryMESA; sPriv->psc->memoryOffset = (void *)r200GetMemoryOffsetMESA; - (*glx_enable_extension) (psc, "GLX_MESA_allocate_memory"); + if (glx_enable_extension == NULL) { + (*glx_enable_extension) (psc, "GLX_MESA_allocate_memory"); + } #endif return screen; |