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

radv: add radv_shader_stage::next_stage field

Browse Source 
This allows to init radv_shader_info correctly when the next stage is
known, this is mostly for ESO. Though, next_stage could be used in
other places too.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26930>
This commit is contained in:
Samuel Pitoiset
2024-01-10 17:19:19 +01:00
committed by Marge Bot
parent a12019cc91
commit 1dbb859b3b
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -227,6 +227,7 @@ radv_pipeline_stage_init(const VkPipelineShaderStageCreateInfo *sinfo,
memset(out_stage, 0, sizeof(*out_stage)); memset(out_stage, 0, sizeof(*out_stage));
out_stage->stage = vk_to_mesa_shader_stage(sinfo->stage); out_stage->stage = vk_to_mesa_shader_stage(sinfo->stage);
out_stage->next_stage = MESA_SHADER_NONE;
out_stage->entrypoint = sinfo->pName; out_stage->entrypoint = sinfo->pName;
out_stage->spec_info = sinfo->pSpecializationInfo; out_stage->spec_info = sinfo->pSpecializationInfo;
out_stage->feedback.flags = VK_PIPELINE_CREATION_FEEDBACK_VALID_BIT; out_stage->feedback.flags = VK_PIPELINE_CREATION_FEEDBACK_VALID_BIT;

9
src/amd/vulkan/radv_pipeline_graphics.c
View File

@@ -2505,7 +2505,13 @@ radv_graphics_shaders_compile(struct radv_device *device, struct vk_pipeline_cac
radv_foreach_stage(i, active_nir_stages) radv_foreach_stage(i, active_nir_stages)
{ {
gl_shader_stage next_stage = radv_get_next_stage(i, active_nir_stages); gl_shader_stage next_stage;
if (stages[i].next_stage != MESA_SHADER_NONE) {
next_stage = stages[i].next_stage;
} else {
next_stage = radv_get_next_stage(i, active_nir_stages);
}
radv_nir_shader_info_init(i, next_stage, &stages[i].info); radv_nir_shader_info_init(i, next_stage, &stages[i].info);
} }
@@ -2638,6 +2644,7 @@ radv_graphics_pipeline_compile(struct radv_graphics_pipeline *pipeline, const Vk
stages[i].entrypoint = NULL; stages[i].entrypoint = NULL;
stages[i].nir = NULL; stages[i].nir = NULL;
stages[i].spirv.size = 0; stages[i].spirv.size = 0;
stages[i].next_stage = MESA_SHADER_NONE;
} }
for (uint32_t i = 0; i < pCreateInfo->stageCount; i++) { for (uint32_t i = 0; i < pCreateInfo->stageCount; i++) {

1
src/amd/vulkan/radv_private.h
View File

@@ -2285,6 +2285,7 @@ struct radv_shader_layout {
struct radv_shader_stage { struct radv_shader_stage {
gl_shader_stage stage; gl_shader_stage stage;
gl_shader_stage next_stage;
struct { struct {
const struct vk_object_base *object; const struct vk_object_base *object;