Mesa (glsl2): mesa: Don' t null deref looking for Mesa IR code at compile time.

[Eric Anholt]

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

Author: Eric Anholt <eric at anholt.net>
Date:   Wed Aug  4 14:13:08 2010 -0700

mesa: Don't null deref looking for Mesa IR code at compile time.

The new compiler doesn't generate Mesa IR at compile time, and that
compile time code previously wouldn't have reflected the link time
code that actually got used.  But do dump the info log of the compile
regardless.

---

 src/mesa/program/prog_print.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/mesa/program/prog_print.c b/src/mesa/program/prog_print.c
index 6ab199a..b66d709 100644
--- a/src/mesa/program/prog_print.c
+++ b/src/mesa/program/prog_print.c
@@ -1031,11 +1031,9 @@ _mesa_write_shader_to_file(const struct gl_shader *shader)
 
    fprintf(f, "/* Compile status: %s */\n",
            shader->CompileStatus ? "ok" : "fail");
-   if (!shader->CompileStatus) {
-      fprintf(f, "/* Log Info: */\n");
-      fputs(shader->InfoLog, f);
-   }
-   else {
+   fprintf(f, "/* Log Info: */\n");
+   fputs(shader->InfoLog, f);
+   if (shader->CompileStatus && shader->Program) {
       fprintf(f, "/* GPU code */\n");
       fprintf(f, "/*\n");
       _mesa_fprint_program_opt(f, shader->Program, PROG_PRINT_DEBUG, GL_TRUE);