fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-31 02:40:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

radeonsi: rename uses_vmem_* flags

Browse source 
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14528>
This commit is contained in:
Marek Olšák 2022-01-12 22:45:53 -05:00 • committed by Marge Bot
parent ee040a6b63
commit 08cc73a218
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gallium/drivers/radeonsi/si_shader.h
View file

@ -413,8 +413,8 @@ struct si_shader_info {
bool uses_indirect_descriptor;
bool has_divergent_loop;
bool uses_vmem_return_type_sampler_or_bvh;
bool uses_vmem_return_type_other; /* all other VMEM loads and atomics with return */
bool uses_vmem_sampler_or_bvh;
bool uses_vmem_load_other; /* all other VMEM loads and atomics with return */
/** Whether all codepaths write tess factors in all invocations. */
bool tessfactors_are_def_in_all_invocs;

14
src/gallium/drivers/radeonsi/si_shader_info.c
View file

@ -384,10 +384,10 @@ static void scan_instruction(const struct nir_shader *nir, struct si_shader_info
case nir_texop_txd:
case nir_texop_lod:
case nir_texop_tg4:
info->uses_vmem_return_type_sampler_or_bvh = true;
info->uses_vmem_sampler_or_bvh = true;
break;
default:
info->uses_vmem_return_type_other = true;
info->uses_vmem_load_other = true;
break;
}
@ -414,16 +414,16 @@ static void scan_instruction(const struct nir_shader *nir, struct si_shader_info
switch (intr->intrinsic) {
case nir_intrinsic_load_ubo:
if (!nir_src_is_const(intr->src[1]))
info->uses_vmem_return_type_other = true;
info->uses_vmem_load_other = true;
break;
case nir_intrinsic_load_constant:
info->uses_vmem_return_type_other = true;
info->uses_vmem_load_other = true;
break;
case nir_intrinsic_load_barycentric_at_sample: /* This loads sample positions. */
case nir_intrinsic_load_tess_level_outer: /* TES input read from memory */
case nir_intrinsic_load_tess_level_inner: /* TES input read from memory */
info->uses_vmem_return_type_other = true;
info->uses_vmem_load_other = true;
break;
case nir_intrinsic_load_input:
@ -431,7 +431,7 @@ static void scan_instruction(const struct nir_shader *nir, struct si_shader_info
case nir_intrinsic_load_per_vertex_input:
if (nir->info.stage == MESA_SHADER_VERTEX ||
nir->info.stage == MESA_SHADER_TESS_EVAL)
info->uses_vmem_return_type_other = true;
info->uses_vmem_load_other = true;
break;
default:
@ -442,7 +442,7 @@ static void scan_instruction(const struct nir_shader *nir, struct si_shader_info
intr->intrinsic == nir_intrinsic_load_global ||
intr->intrinsic == nir_intrinsic_store_global) ||
strstr(intr_name, "scratch"))
info->uses_vmem_return_type_other = true;
info->uses_vmem_load_other = true;
break;
}
}

8
src/gallium/drivers/radeonsi/si_state_shaders.cpp
View file

@ -509,8 +509,8 @@ bool si_shader_mem_ordered(struct si_shader *shader)
const struct si_shader_info *prev_info =
shader->previous_stage_sel ? &shader->previous_stage_sel->info : NULL;
bool sampler_or_bvh = info->uses_vmem_return_type_sampler_or_bvh;
bool other = info->uses_vmem_return_type_other ||
bool sampler_or_bvh = info->uses_vmem_sampler_or_bvh;
bool other = info->uses_vmem_load_other ||
info->uses_indirect_descriptor ||
shader->config.scratch_bytes_per_wave ||
(info->stage == MESA_SHADER_FRAGMENT &&
@ -518,8 +518,8 @@ bool si_shader_mem_ordered(struct si_shader *shader)
shader->key.ps.part.prolog.poly_stipple));
if (prev_info) {
sampler_or_bvh |= prev_info->uses_vmem_return_type_sampler_or_bvh;
other |= prev_info->uses_vmem_return_type_other ||
sampler_or_bvh |= prev_info->uses_vmem_sampler_or_bvh;
other |= prev_info->uses_vmem_load_other ||
prev_info->uses_indirect_descriptor;
}