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

radv/rt: Fix VK_KHR_pipeline_executable_properties

Browse Source 
We don't provide executable properties for the prolog shader.

Fixes: f123d65e9f ('radv/rt: use prolog for raytracing shaders')
Fixes: dEQP-VK.pipeline.monolithic.shader_module_identifier.pipeline_from_id.ray_tracing_libs.*
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22111>
This commit is contained in:
Daniel Schürmann
2023-03-24 02:46:46 +01:00
committed by Marge Bot
parent 2cf6813c19
commit 56b6ca411f
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5519,6 +5519,9 @@ radv_CreateComputePipelines(VkDevice _device, VkPipelineCache pipelineCache, uin
static uint32_t static uint32_t
radv_get_executable_count(struct radv_pipeline *pipeline) radv_get_executable_count(struct radv_pipeline *pipeline)
{ {
if (pipeline->type == RADV_PIPELINE_RAY_TRACING)
return 1;
uint32_t ret = 0; uint32_t ret = 0;
for (int i = 0; i < MESA_VULKAN_SHADER_STAGES; ++i) { for (int i = 0; i < MESA_VULKAN_SHADER_STAGES; ++i) {
if (!pipeline->shaders[i]) if (!pipeline->shaders[i])
@@ -5538,6 +5541,11 @@ static struct radv_shader *
radv_get_shader_from_executable_index(struct radv_pipeline *pipeline, int index, radv_get_shader_from_executable_index(struct radv_pipeline *pipeline, int index,
gl_shader_stage *stage) gl_shader_stage *stage)
{ {
if (pipeline->type == RADV_PIPELINE_RAY_TRACING) {
*stage = MESA_SHADER_RAYGEN;
return pipeline->shaders[*stage];
}
for (int i = 0; i < MESA_VULKAN_SHADER_STAGES; ++i) { for (int i = 0; i < MESA_VULKAN_SHADER_STAGES; ++i) {
if (!pipeline->shaders[i]) if (!pipeline->shaders[i])
continue; continue;