diff options
| author | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2022-08-23 15:54:15 +0200 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2022-09-01 17:02:17 +0000 |
| commit | e9fb732d0a806ddf3fcd2123bc0651838358d95f (patch) | |
| tree | d3a028bf18870e43f6f35e83b065a280fac9aa17 | |
| parent | 0591ff4e5f7301d04e92bffe93c1790d5fbd19e2 (diff) | |
radv: stop setting as_es for the GS stage
This doesn't make sense and it was assigned because the shader info
stuff was a complete mess.
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18278>
| -rw-r--r-- | src/amd/vulkan/radv_pipeline.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c index 6295fe4146c..a459882eeef 100644 --- a/src/amd/vulkan/radv_pipeline.c +++ b/src/amd/vulkan/radv_pipeline.c @@ -3329,11 +3329,9 @@ radv_fill_shader_info(struct radv_pipeline *pipeline, /* Copy data to merged stage. */ if (pre_stage == MESA_SHADER_VERTEX) { - stages[MESA_SHADER_GEOMETRY].info.vs.as_es = stages[MESA_SHADER_VERTEX].info.vs.as_es; stages[MESA_SHADER_GEOMETRY].info.vs.num_linked_outputs = stages[MESA_SHADER_VERTEX].info.vs.num_linked_outputs; } else { - stages[MESA_SHADER_GEOMETRY].info.tes.as_es = stages[MESA_SHADER_TESS_EVAL].info.tes.as_es; stages[MESA_SHADER_GEOMETRY].info.tes.num_linked_outputs = stages[MESA_SHADER_TESS_EVAL].info.tes.num_linked_outputs; stages[MESA_SHADER_GEOMETRY].info.tes.num_linked_inputs = @@ -3350,6 +3348,11 @@ radv_fill_shader_info(struct radv_pipeline *pipeline, } stages[pre_stage].info = stages[MESA_SHADER_GEOMETRY].info; + if (pre_stage == MESA_SHADER_VERTEX) { + stages[MESA_SHADER_VERTEX].info.vs.as_es = true; + } else { + stages[MESA_SHADER_TESS_EVAL].info.tes.as_es = true; + } filled_stages |= (1 << pre_stage); filled_stages |= (1 << MESA_SHADER_GEOMETRY); |