Mesa (glsl2): ir_to_mesa: Add support for MESA_GLSL=dump environment var.

Eric Anholt anholt at kemper.freedesktop.org
Thu Jul 22 20:13:58 UTC 2010


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

Author: Eric Anholt <eric at anholt.net>
Date:   Thu Jul 22 12:11:36 2010 -0700

ir_to_mesa: Add support for MESA_GLSL=dump environment var.

---

 src/mesa/shader/ir_to_mesa.cpp |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/mesa/shader/ir_to_mesa.cpp b/src/mesa/shader/ir_to_mesa.cpp
index bfb8e32..c92fe49 100644
--- a/src/mesa/shader/ir_to_mesa.cpp
+++ b/src/mesa/shader/ir_to_mesa.cpp
@@ -2030,12 +2030,21 @@ get_mesa_program(GLcontext *ctx, struct gl_shader_program *shader_program,
    int i;
    struct gl_program *prog;
    GLenum target;
+   const char *target_string;
    GLboolean progress;
 
    switch (shader->Type) {
-   case GL_VERTEX_SHADER:   target = GL_VERTEX_PROGRAM_ARB; break;
-   case GL_FRAGMENT_SHADER: target = GL_FRAGMENT_PROGRAM_ARB; break;
-   default: assert(!"should not be reached"); break;
+   case GL_VERTEX_SHADER:
+      target = GL_VERTEX_PROGRAM_ARB;
+      target_string = "vertex";
+      break;
+   case GL_FRAGMENT_SHADER:
+      target = GL_FRAGMENT_PROGRAM_ARB;
+      target_string = "fragment";
+      break;
+   default:
+      assert(!"should not be reached");
+      break;
    }
 
    validate_ir_tree(shader->ir);
@@ -2127,7 +2136,8 @@ get_mesa_program(GLcontext *ctx, struct gl_shader_program *shader_program,
    }
 
    set_branchtargets(&v, mesa_instructions, num_instructions);
-   if (0) {
+   if (ctx->Shader.Flags & GLSL_DUMP) {
+      printf("Mesa %s program:\n", target_string);
       print_program(mesa_instructions, mesa_instruction_annotation,
 		    num_instructions);
    }




More information about the mesa-commit mailing list