AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pan/midgard: Pass shader stage to disassembler

Browse Source 
Vertex texturing behaves differently from fragment texturing on some
GPUs.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
This commit is contained in:
Alyssa Rosenzweig
2019-11-07 09:31:02 -05:00
committed by Tomeu Vizoso
parent 515941202d
commit ac14facf7a
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/panfrost/midgard/disassemble.c
+1 -1
View File
@@ -1464,7 +1464,7 @@ print_texture_word(uint32_t *word, unsigned tabs)
}
struct midgard_disasm_stats
disassemble_midgard(uint8_t *code, size_t size, unsigned gpu_id)
disassemble_midgard(uint8_t *code, size_t size, unsigned gpu_id, gl_shader_stage stage)
{
uint32_t *words = (uint32_t *) code;
unsigned num_words = size / 4;
src/panfrost/midgard/disassemble.h
+2 -1
View File
@@ -1,4 +1,5 @@
#include <stddef.h>
#include "compiler/shader_enums.h"
struct midgard_disasm_stats {
/* Counts gleaned from disassembly, or negative if the field cannot be
@@ -23,4 +24,4 @@ struct midgard_disasm_stats {
};
struct midgard_disasm_stats
disassemble_midgard(uint8_t *code, size_t size, unsigned gpu_id);
disassemble_midgard(uint8_t *code, size_t size, unsigned gpu_id, gl_shader_stage stage);
src/panfrost/midgard/midgard_compile.c
+1 -1
View File
@@ -2697,7 +2697,7 @@ midgard_compile_shader_nir(struct midgard_screen *screen, nir_shader *nir, midga
program->tls_size = ctx->tls_size;
if (midgard_debug & MIDGARD_DBG_SHADERS)
disassemble_midgard(program->compiled.data, program->compiled.size, gpu_id);
disassemble_midgard(program->compiled.data, program->compiled.size, gpu_id, ctx->stage);
if (midgard_debug & MIDGARD_DBG_SHADERDB) {
unsigned nr_bundles = 0, nr_ins = 0;
src/panfrost/pandecode/decode.c
+3 -1
View File
@@ -1860,7 +1860,9 @@ pandecode_shader_disassemble(mali_ptr shader_ptr, int shader_no, int type,
stats.quadword_count = 0;
stats.helper_invocations = false;
} else {
stats = disassemble_midgard(code, sz, gpu_id);
stats = disassemble_midgard(code, sz, gpu_id,
type == JOB_TYPE_TILER ?
MESA_SHADER_FRAGMENT : MESA_SHADER_VERTEX);
}
/* Print shader-db stats */