OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[965] Fix ARB_occlusion_query from intel_screen.c merge.

Browse Source 
It wasn't being initialized at screen setup, so we were getting stub
entrypoints even though it was exposed as enabled.  Fixes arbocclude mesa demo.
This commit is contained in:
Eric Anholt
2008-02-13 16:08:19 -08:00
parent 822b2481ff
commit 85063f14ea
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mesa/drivers/dri/i965/intel_context.c
View File

@@ -227,8 +227,10 @@ const struct dri_extension ttm_extensions[] = {
{NULL, NULL} {NULL, NULL}
}; };
const struct dri_extension arb_oc_extension = const struct dri_extension arb_oc_extensions[] = {
{ "GL_ARB_occlusion_query", GL_ARB_occlusion_query_functions}; {"GL_ARB_occlusion_query", GL_ARB_occlusion_query_functions},
{NULL, NULL}
};
/** /**
* Initializes potential list of extensions if ctx == NULL, or actually enables * Initializes potential list of extensions if ctx == NULL, or actually enables
@@ -248,7 +250,7 @@ void intelInitExtensions(GLcontext *ctx, GLboolean enable_imaging)
driInitExtensions(ctx, ttm_extensions, GL_FALSE); driInitExtensions(ctx, ttm_extensions, GL_FALSE);
if (intel == NULL || intel->intelScreen->drmMinor >= 8) if (intel == NULL || intel->intelScreen->drmMinor >= 8)
driInitSingleExtension(ctx, &arb_oc_extension); driInitExtensions(ctx, arb_oc_extensions, GL_FALSE);
} }
static const struct dri_debug_control debug_control[] = static const struct dri_debug_control debug_control[] =

12
src/mesa/drivers/dri/intel/intel_screen.c
View File

@@ -68,11 +68,14 @@ DRI_CONF_END;
const GLuint __driNConfigOptions = 5; const GLuint __driNConfigOptions = 5;
#ifdef USE_NEW_INTERFACE #ifdef USE_NEW_INTERFACE
static PFNGLXCREATECONTEXTMODES create_context_modes = NULL; static PFNGLXCREATECONTEXTMODES create_context_modes = NULL;
#endif /*USE_NEW_INTERFACE */ #endif /*USE_NEW_INTERFACE */
extern const struct dri_extension card_extensions[]; extern const struct dri_extension card_extensions[];
extern const struct dri_extension ttm_extensions[]; extern const struct dri_extension ttm_extensions[];
#ifndef I915
extern const struct dri_extension arb_oc_extensions[];
#endif
/** /**
* Map all the memory regions described by the screen. * Map all the memory regions described by the screen.
@@ -693,6 +696,9 @@ PUBLIC __GLcontextModes *__driDriverInitScreen(__DRIscreenPrivate *psp)
*/ */
driInitExtensions(NULL, card_extensions, GL_FALSE); driInitExtensions(NULL, card_extensions, GL_FALSE);
driInitExtensions(NULL, ttm_extensions, GL_FALSE); driInitExtensions(NULL, ttm_extensions, GL_FALSE);
#ifndef I915
driInitExtensions(NULL, arb_oc_extensions, GL_FALSE);
#endif
if (!intelInitDriver(psp)) if (!intelInitDriver(psp))
return NULL; return NULL;