Mesa (master): intel: Re-enable GL_OES_standard_derivatives on GEN4+
Ian Romanick
idr at kemper.freedesktop.org
Wed Jan 4 18:32:19 UTC 2012
Module: Mesa
Branch: master
Commit: 18f53efa01e6a706ca274929a7a3be9efe7e331f
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=18f53efa01e6a706ca274929a7a3be9efe7e331f
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Mon Jan 2 12:48:34 2012 -0800
intel: Re-enable GL_OES_standard_derivatives on GEN4+
This extension only needs to be disabled on GEN3.
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
---
src/mesa/drivers/dri/intel/intel_extensions_es.c | 22 +++++++++-------------
1 files 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 aef981a..29eb8ea 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[] = {
@@ -110,17 +111,6 @@ intelInitExtensionsES1(struct gl_context *ctx)
}
/**
- * \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;
+ }
}
More information about the mesa-commit
mailing list