From 18f53efa01e6a706ca274929a7a3be9efe7e331f Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Mon, 2 Jan 2012 12:48:34 -0800 Subject: [PATCH] intel: Re-enable GL_OES_standard_derivatives on GEN4+ This extension only needs to be disabled on GEN3. Signed-off-by: Ian Romanick Reviewed-by: Eric Anholt Reviewed-by: Kenneth Graunke --- .../drivers/dri/intel/intel_extensions_es.c | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/src/mesa/drivers/dri/intel/intel_extensions_es.c b/src/mesa/drivers/dri/intel/intel_extensions_es.c index aef981aa582..29eb8eab529 100644 --- a/src/mesa/drivers/dri/intel/intel_extensions_es.c +++ b/src/mesa/drivers/dri/intel/intel_extensions_es.c @@ -28,6 +28,7 @@ #include "main/extensions.h" #include "main/mfeatures.h" +#include "intel_context.h" #include "intel_extensions.h" static const char *common_extensions[] = { @@ -109,17 +110,6 @@ intelInitExtensionsES1(struct gl_context *ctx) _mesa_enable_extension(ctx, es1_extensions[i]); } -/** - * \brief Extensions to disable. - * - * These extensions must be manually disabled because they may have been - * enabled by default. - */ -static const char* es2_extensions_disabled[] = { - "GL_OES_standard_derivatives", - NULL, -}; - /** * Initializes potential list of extensions if ctx == NULL, or actually enables * extensions for a context. @@ -128,11 +118,17 @@ void intelInitExtensionsES2(struct gl_context *ctx) { int i; + struct intel_context *intel = intel_context(ctx); for (i = 0; common_extensions[i]; i++) _mesa_enable_extension(ctx, common_extensions[i]); for (i = 0; es2_extensions[i]; i++) _mesa_enable_extension(ctx, es2_extensions[i]); - for (i = 0; es2_extensions_disabled[i]; i++) - _mesa_disable_extension(ctx, es2_extensions_disabled[i]); + + /* This extension must be manually disabled on GEN3 because it may have + * been enabled by default. + */ + if (intel->gen < 4) { + ctx->Extensions.OES_standard_derivatives = false; + } } -- 2.30.2