Mesa (master): glsl: don't optimize program if MESA_GLSL=nopt

[Brian Paul]

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

Author: Brian Paul <brianp at vmware.com>
Date:   Tue Apr  7 11:01:15 2009 -0600

glsl: don't optimize program if MESA_GLSL=nopt

---

 src/mesa/shader/slang/slang_compile.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/mesa/shader/slang/slang_compile.c b/src/mesa/shader/slang/slang_compile.c
index 6348f79..ba2fc4f 100644
--- 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);
       }
    }