diff options
| -rw-r--r-- | src/compiler/glsl/linker.cpp | 10 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 8 | ||||
| -rw-r--r-- | src/mesa/main/shaderapi.c | 6 | ||||
| -rw-r--r-- | src/mesa/program/prog_print.c | 4 |
4 files changed, 27 insertions, 1 deletions
diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp index 845a7938f91..1a00a900ef0 100644 --- a/src/compiler/glsl/linker.cpp +++ b/src/compiler/glsl/linker.cpp @@ -2297,6 +2297,16 @@ link_intrastage_shaders(void *mem_ctx, if (ctx->Const.VertexID_is_zero_based) lower_vertex_id(linked); +#ifdef DEBUG + /* Compute the source checksum. */ + linked->SourceChecksum = 0; + for (unsigned i = 0; i < num_shaders; i++) { + if (shader_list[i] == NULL) + continue; + linked->SourceChecksum ^= shader_list[i]->SourceChecksum; + } +#endif + return linked; } diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 485f5f18f48..26b19653cb8 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -2282,6 +2282,10 @@ struct gl_linked_shader { gl_shader_stage Stage; +#ifdef DEBUG + unsigned SourceChecksum; +#endif + struct gl_program *Program; /**< Post-compile assembly code */ /** @@ -2414,7 +2418,9 @@ struct gl_shader GLboolean CompileStatus; bool IsES; /**< True if this shader uses GLSL ES */ - GLuint SourceChecksum; /**< for debug/logging purposes */ +#ifdef DEBUG + unsigned SourceChecksum; /**< for debug/logging purposes */ +#endif const GLchar *Source; /**< Source code string */ GLchar *InfoLog; diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index 9592857f0f2..83ee0d4ca7d 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -1149,10 +1149,16 @@ print_shader_info(const struct gl_shader_program *shProg) printf("Mesa: glUseProgram(%u)\n", shProg->Name); for (i = 0; i < shProg->NumShaders; i++) { +#ifdef DEBUG printf(" %s shader %u, checksum %u\n", _mesa_shader_stage_to_string(shProg->Shaders[i]->Stage), shProg->Shaders[i]->Name, shProg->Shaders[i]->SourceChecksum); +#else + printf(" %s shader %u\n", + _mesa_shader_stage_to_string(shProg->Shaders[i]->Stage), + shProg->Shaders[i]->Name); +#endif } if (shProg->_LinkedShaders[MESA_SHADER_VERTEX]) printf(" vert prog %u\n", diff --git a/src/mesa/program/prog_print.c b/src/mesa/program/prog_print.c index bdeb8fd6752..0a4bc51e954 100644 --- a/src/mesa/program/prog_print.c +++ b/src/mesa/program/prog_print.c @@ -976,7 +976,11 @@ _mesa_write_shader_to_file(const struct gl_shader *shader) return; } +#ifdef DEBUG fprintf(f, "/* Shader %u source, checksum %u */\n", shader->Name, shader->SourceChecksum); +#else + fprintf(f, "/* Shader %u source */\n", shader->Name); +#endif fputs(shader->Source, f); fprintf(f, "\n"); |