Mesa (master): pan/mdg: Drop unused stage parameter to disassembler

[GitLab Mirror]

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

Author: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Date:   Mon Jan 18 14:10:13 2021 -0500

pan/mdg: Drop unused stage parameter to disassembler

No longer used but was adding a dependency on compiler/shader_enums.h

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Reviewed-by: Boris Brezillon <boris.brezillon at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8829>

---

 src/panfrost/lib/decode.c              | 4 +---
 src/panfrost/midgard/disassemble.c     | 2 +-
 src/panfrost/midgard/disassemble.h     | 3 +--
 src/panfrost/midgard/midgard_compile.c | 6 ++----
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/panfrost/lib/decode.c b/src/panfrost/lib/decode.c
index b5a6d13373a..ad4a8e0fe75 100644
--- a/src/panfrost/lib/decode.c
+++ b/src/panfrost/lib/decode.c
@@ -568,9 +568,7 @@ pandecode_shader_disassemble(mali_ptr shader_ptr, int shader_no, int type,
                 stats.helper_invocations = false;
         } else {
                 stats = disassemble_midgard(pandecode_dump_stream,
-                                code, sz, gpu_id,
-                                type == MALI_JOB_TYPE_TILER ?
-                                MESA_SHADER_FRAGMENT : MESA_SHADER_VERTEX);
+                                code, sz, gpu_id);
         }
 
         unsigned nr_threads =
diff --git a/src/panfrost/midgard/disassemble.c b/src/panfrost/midgard/disassemble.c
index 5616c200014..84daab31a56 100644
--- a/src/panfrost/midgard/disassemble.c
+++ b/src/panfrost/midgard/disassemble.c
@@ -1584,7 +1584,7 @@ print_texture_word(FILE *fp, uint32_t *word, unsigned tabs, unsigned in_reg_base
 }
 
 struct midgard_disasm_stats
-disassemble_midgard(FILE *fp, uint8_t *code, size_t size, unsigned gpu_id, gl_shader_stage stage)
+disassemble_midgard(FILE *fp, uint8_t *code, size_t size, unsigned gpu_id)
 {
         uint32_t *words = (uint32_t *) code;
         unsigned num_words = size / 4;
diff --git a/src/panfrost/midgard/disassemble.h b/src/panfrost/midgard/disassemble.h
index f01e8cc8429..68fed749aba 100644
--- a/src/panfrost/midgard/disassemble.h
+++ b/src/panfrost/midgard/disassemble.h
@@ -1,5 +1,4 @@
 #include <stddef.h>
-#include "compiler/shader_enums.h"
 
 struct midgard_disasm_stats {
         /* Counts gleaned from disassembly, or negative if the field cannot be
@@ -24,4 +23,4 @@ struct midgard_disasm_stats {
 };
 
 struct midgard_disasm_stats
-disassemble_midgard(FILE *fp, uint8_t *code, size_t size, unsigned gpu_id, gl_shader_stage stage);
+disassemble_midgard(FILE *fp, uint8_t *code, size_t size, unsigned gpu_id);
diff --git a/src/panfrost/midgard/midgard_compile.c b/src/panfrost/midgard/midgard_compile.c
index 63e60d42bcb..ae4f9c6e7bd 100644
--- a/src/panfrost/midgard/midgard_compile.c
+++ b/src/panfrost/midgard/midgard_compile.c
@@ -3173,10 +3173,8 @@ midgard_compile_shader_nir(void *mem_ctx, nir_shader *nir,
         program->tls_size = ctx->tls_size;
 
         if ((midgard_debug & MIDGARD_DBG_SHADERS) && !nir->info.internal) {
-                disassemble_midgard(stdout,
-                                    program->compiled.data,
-                                    program->compiled.size,
-                                    inputs->gpu_id, ctx->stage);
+                disassemble_midgard(stdout, program->compiled.data,
+                                    program->compiled.size, inputs->gpu_id);
         }
 
         if ((midgard_debug & MIDGARD_DBG_SHADERDB || inputs->shaderdb) &&