glsl: don't optimize program if MESA_GLSL=nopt

2009-04-07 11:01:15 -06:00
parent 3e79d65083
commit 4069447f73
1 changed files with 2 additions and 1 deletions
--- a/src/mesa/shader/slang/slang_compile.c
+++ b/src/mesa/shader/slang/slang_compile.c
@@ -2801,7 +2801,8 @@ _slang_compile(GLcontext *ctx, struct gl_shader *shader)
   shader->CompileStatus = success;

   if (success) {
-      if (shader->Pragmas.Optimize) {
+      if (shader->Pragmas.Optimize &&
+          (ctx->Shader.Flags & GLSL_NO_OPT) == 0) {
         _mesa_optimize_program(ctx, shader->Program);
      }
   }