Mesa (master): mesa: Fix the whining for link failures to actually be under MESA_GLSL=dump.

Eric Anholt anholt at kemper.freedesktop.org
Thu Aug 19 04:36:40 UTC 2010


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

Author: Eric Anholt <eric at anholt.net>
Date:   Wed Aug 18 18:01:55 2010 -0700

mesa: Fix the whining for link failures to actually be under MESA_GLSL=dump.

---

 src/mesa/program/ir_to_mesa.cpp |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp
index 7b0c28e..fafc620 100644
--- a/src/mesa/program/ir_to_mesa.cpp
+++ b/src/mesa/program/ir_to_mesa.cpp
@@ -2750,6 +2750,11 @@ _mesa_glsl_link_shader(GLcontext *ctx, struct gl_shader_program *prog)
    if (prog->LinkStatus) {
       if (!ctx->Driver.LinkShader(ctx, prog)) {
 	 prog->LinkStatus = GL_FALSE;
+      }
+   }
+
+   if (ctx->Shader.Flags & GLSL_DUMP) {
+      if (!prog->LinkStatus) {
 	 printf("GLSL shader program %d failed to link\n", prog->Name);
       }
 




More information about the mesa-commit mailing list