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/i915/intel_screen.c | |
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/i915/intel_screen.c')
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_screen.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/i915/intel_screen.c b/src/mesa/drivers/dri/i915/intel_screen.c index e474850c63..f9c618e644 100644 --- a/src/mesa/drivers/dri/i915/intel_screen.c +++ b/src/mesa/drivers/dri/i915/intel_screen.c @@ -80,10 +80,6 @@ static GLboolean intelInitDriver(__DRIscreenPrivate *sPriv) void * const psc = sPriv->psc->screenConfigs; - if (glx_enable_extension == NULL) { - return GL_FALSE; - } - /* Allocate the private area */ intelScreen = (intelScreenPrivate *)CALLOC(sizeof(intelScreenPrivate)); if (!intelScreen) { @@ -199,14 +195,15 @@ static GLboolean intelInitDriver(__DRIscreenPrivate *sPriv) } } - (*glx_enable_extension)( psc, "GLX_SGI_make_current_read" ); + if (glx_enable_extension == NULL) { + (*glx_enable_extension)( psc, "GLX_SGI_make_current_read" ); + (*glx_enable_extension)( psc, "GLX_MESA_allocate_memory" ); + } sPriv->psc->allocateMemory = (void *) intelAllocateMemoryMESA; sPriv->psc->freeMemory = (void *) intelFreeMemoryMESA; sPriv->psc->memoryOffset = (void *) intelGetMemoryOffsetMESA; - (*glx_enable_extension)( psc, "GLX_MESA_allocate_memory" ); - return GL_TRUE; } |