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

radv: stop setting as_es for the GS stage

Browse Source 
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>
This commit is contained in:
Samuel Pitoiset
2022-08-23 15:54:15 +02:00
committed by Marge Bot
parent 0591ff4e5f
commit e9fb732d0a
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/amd/vulkan/radv_pipeline.c
View File

@@ -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);