Mesa (main): mesa: remove SourceChecksum from shader structures

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 0bb580754cda1ba544be761b0ea40ba441d04636
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0bb580754cda1ba544be761b0ea40ba441d04636

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Thu Nov 18 08:37:47 2021 -0500

mesa: remove SourceChecksum from shader structures

it will be replaced by sha1.

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13869>

---

 src/compiler/glsl/linker.cpp         | 10 ----------
 src/mesa/main/ff_fragment_shader.cpp |  3 ---
 src/mesa/main/mtypes.h               |  7 -------
 src/mesa/main/shaderapi.c            | 10 ----------
 src/mesa/main/shaderobj.c            |  3 ---
 src/mesa/program/prog_print.c        |  4 ----
 6 files changed, 37 deletions(-)

diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp
index d8c8d20c9ef..fa44fa887bc 100644
--- a/src/compiler/glsl/linker.cpp
+++ b/src/compiler/glsl/linker.cpp
@@ -2654,16 +2654,6 @@ link_intrastage_shaders(void *mem_ctx,
    if (ctx->Const.LowerCsDerivedVariables)
       lower_cs_derived(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/ff_fragment_shader.cpp b/src/mesa/main/ff_fragment_shader.cpp
index 302c3b1de9b..c40ea9586d9 100644
--- a/src/mesa/main/ff_fragment_shader.cpp
+++ b/src/mesa/main/ff_fragment_shader.cpp
@@ -1037,9 +1037,6 @@ create_new_program(struct gl_context *ctx, struct state_key *key)
 
    p.mem_ctx = ralloc_context(NULL);
    p.shader = _mesa_new_shader(0, MESA_SHADER_FRAGMENT);
-#ifdef DEBUG
-   p.shader->SourceChecksum = 0xf18ed; /* fixed */
-#endif
    p.shader->ir = new(p.shader) exec_list;
    state = new(p.shader) _mesa_glsl_parse_state(ctx, MESA_SHADER_FRAGMENT,
 						p.shader);
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 1a43d7ce980..203f365465f 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2609,10 +2609,6 @@ struct gl_linked_shader
 {
    gl_shader_stage Stage;
 
-#ifdef DEBUG
-   unsigned SourceChecksum;
-#endif
-
    struct gl_program *Program;  /**< Post-compile assembly code */
 
    /**
@@ -2686,9 +2682,6 @@ struct gl_shader
 
    enum gl_compile_status CompileStatus;
 
-#ifdef DEBUG
-   unsigned SourceChecksum;       /**< for debug/logging purposes */
-#endif
    const GLchar *Source;  /**< Source code string */
 
    const GLchar *FallbackSource;  /**< Fallback string used by on-disk cache*/
diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index 294f6471f71..7d43c95aa9b 100644
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -1208,9 +1208,6 @@ set_shader_source(struct gl_shader *sh, const GLchar *source)
       sh->Source = source;
    }
 
-#ifdef DEBUG
-   sh->SourceChecksum = util_hash_crc32(sh->Source, strlen(sh->Source));
-#endif
 }
 
 static void
@@ -1499,16 +1496,9 @@ 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/main/shaderobj.c b/src/mesa/main/shaderobj.c
index 9fadece8424..5d7dd85672c 100644
--- a/src/mesa/main/shaderobj.c
+++ b/src/mesa/main/shaderobj.c
@@ -118,9 +118,6 @@ _mesa_new_shader(GLuint name, gl_shader_stage stage)
    if (shader) {
       shader->Stage = stage;
       shader->Name = name;
-#ifdef DEBUG
-      shader->SourceChecksum = 0xa110c; /* alloc */
-#endif
       _mesa_init_shader(shader);
    }
    return shader;
diff --git a/src/mesa/program/prog_print.c b/src/mesa/program/prog_print.c
index edf3263de68..c02a5e933f9 100644
--- a/src/mesa/program/prog_print.c
+++ b/src/mesa/program/prog_print.c
@@ -997,11 +997,7 @@ _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");