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

radv: rename needs_multiview_view_index to uses_view_index 

To avoid confusion with radv_pipeline_key::has_multiview_view_index.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13243>
This commit is contained in:
Samuel Pitoiset 2021-10-06 14:18:01 +02:00
parent 960d7bf2d3
commit 595b16013a
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/amd/vulkan/radv_shader.h
View File

@ -221,7 +221,7 @@ struct radv_shader_info {
bool has_only_32bit_push_constants;
bool has_indirect_push_constants;
uint32_t desc_set_used_mask;
bool needs_multiview_view_index;
bool uses_view_index;
bool uses_invocation_id;
bool uses_prim_id;
uint8_t wave_size;

8
src/amd/vulkan/radv_shader_args.c
View File

@ -79,22 +79,22 @@ needs_view_index_sgpr(struct radv_shader_args *args, gl_shader_stage stage)
{
switch (stage) {
case MESA_SHADER_VERTEX:
if (args->shader_info->needs_multiview_view_index ||
if (args->shader_info->uses_view_index ||
(!args->shader_info->vs.as_es && !args->shader_info->vs.as_ls &&
args->options->key.has_multiview_view_index))
return true;
break;
case MESA_SHADER_TESS_EVAL:
if (args->shader_info->needs_multiview_view_index ||
if (args->shader_info->uses_view_index ||
(!args->shader_info->tes.as_es && args->options->key.has_multiview_view_index))
return true;
break;
case MESA_SHADER_TESS_CTRL:
if (args->shader_info->needs_multiview_view_index)
if (args->shader_info->uses_view_index)
return true;
break;
case MESA_SHADER_GEOMETRY:
if (args->shader_info->needs_multiview_view_index ||
if (args->shader_info->uses_view_index ||
(args->shader_info->is_ngg && args->options->key.has_multiview_view_index))
return true;
break;

2
src/amd/vulkan/radv_shader_info.c
View File

@ -218,7 +218,7 @@ gather_intrinsic_info(const nir_shader *nir, const nir_intrinsic_instr *instr,
info->ps.reads_sample_pos_mask = nir_ssa_def_components_read(&instr->dest.ssa);
break;
case nir_intrinsic_load_view_index:
info->needs_multiview_view_index = true;
info->uses_view_index = true;
break;
case nir_intrinsic_load_invocation_id:
info->uses_invocation_id = true;