diff options
| author | Eric Anholt <eric@anholt.net> | 2008-02-13 16:08:19 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2008-02-13 16:08:35 -0800 |
| commit | 85063f14ea431b586d710f249563fc73481552c7 (patch) | |
| tree | 904d94e7bd9d41e5201a0105705ab3e50374cb27 /src/mesa/drivers/dri/intel | |
| parent | 822b2481ffc0d3e2ca9d24e9443634af2760777c (diff) | |
[965] Fix ARB_occlusion_query from intel_screen.c merge.
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.
Diffstat (limited to 'src/mesa/drivers/dri/intel')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_screen.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c index 247fc4c5bc..84c77d3991 100644 --- a/src/mesa/drivers/dri/intel/intel_screen.c +++ b/src/mesa/drivers/dri/intel/intel_screen.c @@ -68,11 +68,14 @@ DRI_CONF_END; const GLuint __driNConfigOptions = 5; #ifdef USE_NEW_INTERFACE - static PFNGLXCREATECONTEXTMODES create_context_modes = NULL; +static PFNGLXCREATECONTEXTMODES create_context_modes = NULL; #endif /*USE_NEW_INTERFACE */ - extern const struct dri_extension card_extensions[]; - extern const struct dri_extension ttm_extensions[]; +extern const struct dri_extension card_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. @@ -693,6 +696,9 @@ PUBLIC __GLcontextModes *__driDriverInitScreen(__DRIscreenPrivate *psp) */ driInitExtensions(NULL, card_extensions, GL_FALSE); driInitExtensions(NULL, ttm_extensions, GL_FALSE); +#ifndef I915 + driInitExtensions(NULL, arb_oc_extensions, GL_FALSE); +#endif if (!intelInitDriver(psp)) return NULL; |