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/i915/intel_screen.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/mesa/drivers/dri/i915') diff --git a/src/mesa/drivers/dri/i915/intel_screen.c b/src/mesa/drivers/dri/i915/intel_screen.c index e474850c634..f9c618e6441 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; } -- cgit v1.2.3