diff options
author | Eric Anholt <[email protected]> | 2010-08-04 14:13:08 -0700 |
---|---|---|
committer | Eric Anholt <[email protected]> | 2010-08-04 14:13:08 -0700 |
commit | 8e181b629f97ada65cc1b8a17ba42edc2ea77254 (patch) | |
tree | 18a72f21041c55c436d7eaaeb261bfc2462bce8e | |
parent | 952d0f88e1741d51b641be75f7c5a6565e245a69 (diff) |
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.
-rw-r--r-- | 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 6ab199aa02b..b66d709d50f 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); |