mesa: make _mesa_override_glsl_version context-independent

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>

diff --git a/src/mesa/drivers/dri/i915/intel_extensions.c b/src/mesa/drivers/dri/i915/intel_extensions.c
index de716a7829c19f1b567b1371ecb923de2ab64021..ab7820f1232ebb0db60c8a14bd3c7c31f79c10ee 100644 (file)
--- a/src/mesa/drivers/dri/i915/intel_extensions.c
+++ b/src/mesa/drivers/dri/i915/intel_extensions.c
@@ -78,7 +78,7 @@ intelInitExtensions(struct gl_context *ctx)
    ctx->Extensions.OES_draw_texture = true;
 
    ctx->Const.GLSLVersion = 120;
-   _mesa_override_glsl_version(ctx);
+   _mesa_override_glsl_version(&ctx->Const);
 
    if (intel->gen >= 3) {
       ctx->Extensions.ARB_ES2_compatibility = true;

diff --git a/src/mesa/drivers/dri/i965/intel_extensions.c b/src/mesa/drivers/dri/i965/intel_extensions.c
index 5d71db5f0e40319edd4092ea30cf14d86b9c4f7f..31cf75103e7df4d773a443655a46fc921a790fe4 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_extensions.c
+++ b/src/mesa/drivers/dri/i965/intel_extensions.c
@@ -249,7 +249,7 @@ intelInitExtensions(struct gl_context *ctx)
       ctx->Const.GLSLVersion = 140;
    else
       ctx->Const.GLSLVersion = 120;
-   _mesa_override_glsl_version(ctx);
+   _mesa_override_glsl_version(&ctx->Const);
 
    if (brw->gen >= 6) {
       uint64_t dummy;

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 50aae8bf6fa9da2e476726ccc7d067826b33c542..0f28dbf734120fd4483fac35ae2a85bf234c6854 100644 (file)
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -641,7 +641,7 @@ _mesa_init_constants(struct gl_context *ctx)
    /* Shading language version */
    if (_mesa_is_desktop_gl(ctx)) {
       ctx->Const.GLSLVersion = 120;
-      _mesa_override_glsl_version(ctx);
+      _mesa_override_glsl_version(&ctx->Const);
    }
    else if (ctx->API == API_OPENGLES2) {
       ctx->Const.GLSLVersion = 100;

diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c
index b7cc50fc146f15b5f33b053a8d090debee2ccf0a..7621144c46914dccd9c2003beac99464d4030270 100644 (file)
--- a/src/mesa/main/version.c
+++ b/src/mesa/main/version.c
@@ -168,7 +168,7 @@ _mesa_get_gl_version_override(void)
  * MESA_GLSL_VERSION_OVERRIDE are integers, such as "130".
  */
 void
-_mesa_override_glsl_version(struct gl_context *ctx)
+_mesa_override_glsl_version(struct gl_constants *consts)
 {
    const char *env_var = "MESA_GLSL_VERSION_OVERRIDE";
    const char *version;
@@ -179,7 +179,7 @@ _mesa_override_glsl_version(struct gl_context *ctx)
       return;
    }
 
-   n = sscanf(version, "%u", &ctx->Const.GLSLVersion);
+   n = sscanf(version, "%u", &consts->GLSLVersion);
    if (n != 1) {
       fprintf(stderr, "error: invalid value for %s: %s\n", env_var, version);
       return;

diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h
index c78f87a2b4e1f580cdf31e4bac4d0dd0e42e0782..42eada99bf8bcc48e360690af04a902e34431c46 100644 (file)
--- a/src/mesa/main/version.h
+++ b/src/mesa/main/version.h
@@ -29,6 +29,7 @@
 
 
 struct gl_context;
+struct gl_constants;
 
 
 extern void
@@ -38,7 +39,7 @@ extern void
 _mesa_override_gl_version(struct gl_context *ctx);
 
 extern void
-_mesa_override_glsl_version(struct gl_context *ctx);
+_mesa_override_glsl_version(struct gl_constants *consts);
 
 extern int
 _mesa_get_gl_version_override(void);

diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index 60aa8ccec0bcb7057604dec2b9ede61e62710c31..f04ff4c3dec143049b1664a25d478b18c9f9525e 100644 (file)
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -617,7 +617,7 @@ void st_init_extensions(struct st_context *st)
    if (glsl_feature_level >= 330)
       ctx->Const.GLSLVersion = 330;
 
-   _mesa_override_glsl_version(st->ctx);
+   _mesa_override_glsl_version(&st->ctx->Const);
 
    if (st->options.force_glsl_version > 0 &&
        st->options.force_glsl_version <= ctx->Const.GLSLVersion) {