summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/r600
diff options
context:
space:
mode:
authorChad Versace <[email protected]>2011-09-27 13:53:11 -0700
committerChad Versace <[email protected]>2011-09-28 11:29:52 -0700
commita1eff5570f5e3f893fe4d453aef5ce143712ab09 (patch)
tree603b8e0db9e686558f5fcab3a6365fa84a89e0f1 /src/mesa/drivers/dri/r600
parent124fc96ddf2695b4eca1a9b373f33cb993de9f6a (diff)
mesa: Allow overriding GLSL version with environment variable
Override the context's GLSL version if the environment variable MESA_GLSL_VERSION_OVERRIDE is set. Valid values for MESA_GLSL_VERSION_OVERRIDE are integers, such as "130". MESA_GLSL_VERSION_OVERRIDE has the same behavior as INTEL_GLSL_VERSION, except that it applies to all drivers, not just Intel's. Since the former supercedes the latter, this patch disables the latter. Reviewed-by: Dave Airlie <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]> Signed-off-by: Chad Versace <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/r600')
-rw-r--r--src/mesa/drivers/dri/r600/r600_context.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/r600/r600_context.c b/src/mesa/drivers/dri/r600/r600_context.c
index 247d5510156..3e296efdb6d 100644
--- a/src/mesa/drivers/dri/r600/r600_context.c
+++ b/src/mesa/drivers/dri/r600/r600_context.c
@@ -173,6 +173,7 @@ static void r600InitConstValues(struct gl_context *ctx, radeonScreenPtr screen)
}
ctx->Const.GLSLVersion = 120;
+ _mesa_override_glsl_version(ctx);
ctx->Const.MaxTextureImageUnits = 16;
/* 8 per clause on r6xx, 16 on r7xx