Mesa (master): intel: Expose GL_EXT_texture_integer when GL 3. 0 override is set.

Eric Anholt anholt at kemper.freedesktop.org
Thu Nov 10 00:11:57 UTC 2011


Module: Mesa
Branch: master
Commit: 704b7551e88b680f2bf814cbcacd24051ad8e19c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=704b7551e88b680f2bf814cbcacd24051ad8e19c

Author: Eric Anholt <eric at anholt.net>
Date:   Wed Oct  5 13:25:36 2011 -0700

intel: Expose GL_EXT_texture_integer when GL 3.0 override is set.

This will let the feature be incrementally developed, hidden behind
the flag we're all using as we work on GL 3.0 support.

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

---

 src/mesa/drivers/dri/intel/intel_extensions.c |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/src/mesa/drivers/dri/intel/intel_extensions.c b/src/mesa/drivers/dri/intel/intel_extensions.c
index 7a5ef3e..89f0920 100644
--- a/src/mesa/drivers/dri/intel/intel_extensions.c
+++ b/src/mesa/drivers/dri/intel/intel_extensions.c
@@ -41,6 +41,14 @@ void
 intelInitExtensions(struct gl_context *ctx)
 {
    struct intel_context *intel = intel_context(ctx);
+   char *override = getenv("MESA_GL_VERSION_OVERRIDE");
+   int override_major, override_minor;
+   int override_version = 0;
+
+   if (override &&
+       sscanf(override, "%u.%u", &override_major, &override_minor) == 2) {
+      override_version = override_major * 10 + override_minor;
+   }
 
    ctx->Extensions.ARB_draw_elements_base_vertex = true;
    ctx->Extensions.ARB_explicit_attrib_location = true;
@@ -117,6 +125,8 @@ intelInitExtensions(struct gl_context *ctx)
       ctx->Extensions.EXT_draw_buffers2 = true;
       ctx->Extensions.EXT_framebuffer_sRGB = true;
       ctx->Extensions.EXT_texture_array = true;
+      if (override_version >= 30)
+	 ctx->Extensions.EXT_texture_integer = true;
       ctx->Extensions.EXT_texture_snorm = true;
       ctx->Extensions.EXT_texture_sRGB = true;
       ctx->Extensions.EXT_texture_sRGB_decode = true;




More information about the mesa-commit mailing list