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

intel: Don't check for context pointer to be NULL during extension init

Browse Source 
Thanks to Chia-I Wu's changes to the extension function
infrastructure, we no longer have to tell the loader which extensions
the driver might enable.  This means that intelInitExtensions will
never be called with a NULL context pointer.  Remove all the NULL checks.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Ian Romanick
2009-11-12 15:39:59 -08:00
parent a736d3f439
commit b6b753f727
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/mesa/drivers/dri/intel/intel_extensions.c
View File

@@ -196,27 +196,26 @@ static const struct dri_extension fragment_shader_extensions[] = {
void
intelInitExtensions(GLcontext *ctx)
{
struct intel_context *intel = ctx?intel_context(ctx):NULL;
struct intel_context *intel = intel_context(ctx);
/* Disable imaging extension until convolution is working in teximage paths.
*/
driInitExtensions(ctx, card_extensions, GL_FALSE);
if (intel == NULL || intel->ttm)
if (intel->ttm)
driInitExtensions(ctx, ttm_extensions, GL_FALSE);
if (intel == NULL || IS_965(intel->intelScreen->deviceID))
if (IS_965(intel->intelScreen->deviceID))
driInitExtensions(ctx, brw_extensions, GL_FALSE);
if (intel == NULL || IS_915(intel->intelScreen->deviceID)
if (IS_915(intel->intelScreen->deviceID)
|| IS_945(intel->intelScreen->deviceID)) {
driInitExtensions(ctx, i915_extensions, GL_FALSE);
if (intel == NULL || driQueryOptionb(&intel->optionCache, "fragment_shader"))
if (driQueryOptionb(&intel->optionCache, "fragment_shader"))
driInitExtensions(ctx, fragment_shader_extensions, GL_FALSE);
if (intel == NULL || driQueryOptionb(&intel->optionCache,
"stub_occlusion_query"))
if (driQueryOptionb(&intel->optionCache, "stub_occlusion_query"))
driInitExtensions(ctx, arb_oq_extensions, GL_FALSE);
}
}