From bd86ded02712c90071fbfb71f71b4135be6b668c Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Wed, 10 Jul 2019 13:03:49 +0200 Subject: [PATCH] radv: set the LayerId output usage mask if FS needs it When the stage preceding FS doesn't export it the fragment shader might read it, even if it's 0. Signed-off-by: Samuel Pitoiset Reviewed-by: Bas Nieuwenhuizen --- src/amd/vulkan/radv_shader_info.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/amd/vulkan/radv_shader_info.c b/src/amd/vulkan/radv_shader_info.c index 2756d99e769..946f7aa5f23 100644 --- a/src/amd/vulkan/radv_shader_info.c +++ b/src/amd/vulkan/radv_shader_info.c @@ -576,4 +576,21 @@ radv_nir_shader_info_pass(const struct nir_shader *nir, nir->info.stage == MESA_SHADER_TESS_EVAL || nir->info.stage == MESA_SHADER_GEOMETRY) gather_xfb_info(nir, info); + + /* Make sure to export the LayerID if the fragment shader needs it. */ + if (options->key.vs_common_out.export_layer_id) { + switch (nir->info.stage) { + case MESA_SHADER_VERTEX: + info->vs.output_usage_mask[VARYING_SLOT_LAYER] |= 0x1; + break; + case MESA_SHADER_TESS_EVAL: + info->tes.output_usage_mask[VARYING_SLOT_LAYER] |= 0x1; + break; + case MESA_SHADER_GEOMETRY: + info->gs.output_usage_mask[VARYING_SLOT_LAYER] |= 0x1; + break; + default: + break; + } + } } -- 2.30.2