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

radv: replace convert_rt_stage() by vk_to_mesa_shader_stage()

Browse Source 
Mesa shader stages are correctly sorted.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15847>
This commit is contained in:
Samuel Pitoiset
2022-04-08 16:28:26 +02:00
committed by Marge Bot
parent f1202a92cf
commit c1b9c1269d
1 changed files with 1 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/amd/vulkan/radv_pipeline_rt.c
View File

@@ -788,27 +788,6 @@ lower_rt_derefs(nir_shader *shader)
return progress; return progress;
} }
static gl_shader_stage
convert_rt_stage(VkShaderStageFlagBits vk_stage)
{
switch (vk_stage) {
case VK_SHADER_STAGE_RAYGEN_BIT_KHR:
return MESA_SHADER_RAYGEN;
case VK_SHADER_STAGE_ANY_HIT_BIT_KHR:
return MESA_SHADER_ANY_HIT;
case VK_SHADER_STAGE_CLOSEST_HIT_BIT_KHR:
return MESA_SHADER_CLOSEST_HIT;
case VK_SHADER_STAGE_MISS_BIT_KHR:
return MESA_SHADER_MISS;
case VK_SHADER_STAGE_INTERSECTION_BIT_KHR:
return MESA_SHADER_INTERSECTION;
case VK_SHADER_STAGE_CALLABLE_BIT_KHR:
return MESA_SHADER_CALLABLE;
default:
unreachable("Unhandled RT stage");
}
}
static nir_shader * static nir_shader *
parse_rt_stage(struct radv_device *device, const VkPipelineShaderStageCreateInfo *sinfo) parse_rt_stage(struct radv_device *device, const VkPipelineShaderStageCreateInfo *sinfo)
{ {
@@ -816,7 +795,7 @@ parse_rt_stage(struct radv_device *device, const VkPipelineShaderStageCreateInfo
memset(&key, 0, sizeof(key)); memset(&key, 0, sizeof(key));
struct radv_pipeline_stage rt_stage = { struct radv_pipeline_stage rt_stage = {
.stage = convert_rt_stage(sinfo->stage), .stage = vk_to_mesa_shader_stage(sinfo->stage),
.module = vk_shader_module_from_handle(sinfo->module), .module = vk_shader_module_from_handle(sinfo->module),
.entrypoint = sinfo->pName, .entrypoint = sinfo->pName,
.spec_info = sinfo->pSpecializationInfo, .spec_info = sinfo->pSpecializationInfo,