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

nir: Fix printing of individual instructions with io semantics. 

The state->shader is missing when used outside of nir_print_shader, just
drop these details in that case.  We can fix nir_print_instr() to look up
the shader, but let's also make sure that an instr detached from a shader
(such as one you're constructing but haven't yet inserted) still works.

Fixes: 2b1ef5df4e ("nir: print IO semantics (v2)")
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6496>
This commit is contained in:
Eric Anholt 2020-08-27 11:33:31 -07:00 committed by Marge Bot
parent 4c050f222f
commit a3a8322dcd
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/compiler/nir/nir_print.c
View File

@ -929,25 +929,27 @@ print_intrinsic_instr(nir_intrinsic_instr *instr, print_state *state)
fprintf(fp, " location=%u slots=%u",
nir_intrinsic_io_semantics(instr).location,
nir_intrinsic_io_semantics(instr).num_slots);
if (state->shader->info.stage == MESA_SHADER_FRAGMENT &&
instr->intrinsic == nir_intrinsic_store_output &&
nir_intrinsic_io_semantics(instr).dual_source_blend_index) {
fprintf(fp, " dualsrc=1");
}
if (state->shader->info.stage == MESA_SHADER_FRAGMENT &&
instr->intrinsic == nir_intrinsic_load_output &&
nir_intrinsic_io_semantics(instr).fb_fetch_output) {
fprintf(fp, " fbfetch=1");
}
if (state->shader->info.stage == MESA_SHADER_GEOMETRY &&
instr->intrinsic == nir_intrinsic_store_output) {
unsigned gs_streams = nir_intrinsic_io_semantics(instr).gs_streams;
fprintf(fp, " gs_streams(");
for (unsigned i = 0; i < 4; i++) {
fprintf(fp, "%s%c=%u", i ? " " : "", "xyzw"[i],
(gs_streams >> (i * 2)) & 0x3);
if (state->shader) {
if (state->shader->info.stage == MESA_SHADER_FRAGMENT &&
instr->intrinsic == nir_intrinsic_store_output &&
nir_intrinsic_io_semantics(instr).dual_source_blend_index) {
fprintf(fp, " dualsrc=1");
}
if (state->shader->info.stage == MESA_SHADER_FRAGMENT &&
instr->intrinsic == nir_intrinsic_load_output &&
nir_intrinsic_io_semantics(instr).fb_fetch_output) {
fprintf(fp, " fbfetch=1");
}
if (state->shader->info.stage == MESA_SHADER_GEOMETRY &&
instr->intrinsic == nir_intrinsic_store_output) {
unsigned gs_streams = nir_intrinsic_io_semantics(instr).gs_streams;
fprintf(fp, " gs_streams(");
for (unsigned i = 0; i < 4; i++) {
fprintf(fp, "%s%c=%u", i ? " " : "", "xyzw"[i],
(gs_streams >> (i * 2)) & 0x3);
}
fprintf(fp, ")");
}
fprintf(fp, ")");
}
break;