Mesa (master): intel_extensions: Add ability to set GLSL version via environment

Ian Romanick idr at kemper.freedesktop.org
Mon Oct 11 21:27:59 UTC 2010


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

Author: Chad Versace <chad at chad-versace.us>
Date:   Thu Oct  7 16:04:30 2010 -0700

intel_extensions: Add ability to set GLSL version via environment

Add ability to set the GLSL version used by the GLcontext by setting the
environment variable INTEL_GLSL_VERSION. For example,
    env INTEL_GLSL_VERSION=130 prog args
If the environment variable is missing, the GLSL versions defaults to 120.

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

---

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

diff --git a/src/mesa/drivers/dri/intel/intel_extensions.c b/src/mesa/drivers/dri/intel/intel_extensions.c
index 1a32026..8d38a28 100644
--- a/src/mesa/drivers/dri/intel/intel_extensions.c
+++ b/src/mesa/drivers/dri/intel/intel_extensions.c
@@ -197,6 +197,22 @@ static const struct dri_extension fragment_shader_extensions[] = {
 };
 
 /**
+ * \brief Get GLSL version from the environment.
+ *
+ * If the environment variable INTEL_GLSL_VERSION is set, convert its value
+ * to an integer and return it. Otherwise, return the default version, 120.
+ */
+static GLuint
+get_glsl_version()
+{
+    const char * s = getenv("INTEL_GLSL_VERSION");
+    if (s == NULL)
+        return 120;
+    else
+        return (GLuint) atoi(s);
+}
+
+/**
  * Initializes potential list of extensions if ctx == NULL, or actually enables
  * extensions for a context.
  */
@@ -208,7 +224,8 @@ intelInitExtensions(GLcontext *ctx)
    driInitExtensions(ctx, card_extensions, GL_FALSE);
 
    _mesa_map_function_array(GL_VERSION_2_1_functions);
-   ctx->Const.GLSLVersion = 120;
+
+   ctx->Const.GLSLVersion = get_glsl_version();
 
    if (intel->gen >= 5)
       driInitExtensions(ctx, ironlake_extensions, GL_FALSE);




More information about the mesa-commit mailing list