OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir: Emit set_vertex_and_primitive_count for inactive streams.

Browse Source 
This fixes issues in backends such as ACO which rely on always
getting this intrinsic to know the correct vertex and primitive
count.

Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7213>
This commit is contained in:
Timur Kristóf
2020-10-19 11:45:35 +02:00
committed by Marge Bot
parent 07fae31e8c
commit d9cb9ff414
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/compiler/nir/nir_lower_gs_intrinsics.c
View File

@@ -293,20 +293,25 @@ append_set_vertex_and_primitive_count(nir_block *end_block, struct state *state)
/* When it's not per-stream, we only need to write one variable. */ /* When it's not per-stream, we only need to write one variable. */
if (!state->per_stream && stream != 0) if (!state->per_stream && stream != 0)
continue; continue;
/* When it's per-stream, make sure not to use inactive streams. */
if (state->per_stream && !(shader->info.gs.active_stream_mask & (1 << stream)))
continue;
if (state->overwrite_incomplete) nir_ssa_def *vtx_cnt;
overwrite_incomplete_primitives(state, stream);
nir_ssa_def *vtx_cnt = nir_load_var(b, state->vertex_count_vars[stream]);
nir_ssa_def *prim_cnt; nir_ssa_def *prim_cnt;
if (state->count_prims) if (state->per_stream && !(shader->info.gs.active_stream_mask & (1 << stream))) {
prim_cnt = nir_load_var(b, state->primitive_count_vars[stream]); /* Inactive stream: vertex count is 0, primitive count is 0 or undef. */
else vtx_cnt = nir_imm_int(b, 0);
prim_cnt = nir_ssa_undef(b, 1, 32); prim_cnt = state->count_prims
? nir_imm_int(b, 0)
: nir_ssa_undef(b, 1, 32);
} else {
if (state->overwrite_incomplete)
overwrite_incomplete_primitives(state, stream);
vtx_cnt = nir_load_var(b, state->vertex_count_vars[stream]);
prim_cnt = state->count_prims
? nir_load_var(b, state->primitive_count_vars[stream])
: nir_ssa_undef(b, 1, 32);
}
nir_intrinsic_instr *set_cnt_intrin = nir_intrinsic_instr *set_cnt_intrin =
nir_intrinsic_instr_create(shader, nir_intrinsic_instr_create(shader,