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

radv: remove radv_generate_pipeline_key()

Browse Source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27073>
This commit is contained in:
Samuel Pitoiset
2024-01-15 14:48:09 +01:00
committed by Marge Bot
parent 72d2eb39fb
commit c5a5ab46c9
3 changed files with 8 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -212,21 +212,6 @@ radv_pipeline_get_shader_key(const struct radv_device *device, const VkPipelineS
return key;
}
struct radv_pipeline_key
radv_generate_pipeline_key(const struct radv_device *device, const VkPipelineShaderStageCreateInfo *stages,
const unsigned num_stages, VkPipelineCreateFlags2KHR flags, const void *pNext)
{
struct radv_pipeline_key key = {0};
for (uint32_t i = 0; i < num_stages; i++) {
gl_shader_stage s = vk_to_mesa_shader_stage(stages[i].stage);
key.stage_info[s] = radv_pipeline_get_shader_key(device, &stages[i], flags, pNext);
}
return key;
}
void
radv_pipeline_stage_init(const VkPipelineShaderStageCreateInfo *sinfo,
const struct radv_pipeline_layout *pipeline_layout,

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

@@ -1968,11 +1968,17 @@ radv_generate_graphics_pipeline_key(const struct radv_device *device, const stru
const struct vk_graphics_pipeline_state *state,
VkGraphicsPipelineLibraryFlagBitsEXT lib_flags)
{
struct radv_pipeline_key key = radv_generate_pipeline_key(device, pCreateInfo->pStages, pCreateInfo->stageCount,
pipeline->base.create_flags, pCreateInfo->pNext);
struct radv_pipeline_key key = {0};
key.gfx_state = radv_generate_graphics_state_key(device, pipeline, state, lib_flags);
for (uint32_t i = 0; i < pCreateInfo->stageCount; i++) {
const VkPipelineShaderStageCreateInfo *stage = &pCreateInfo->pStages[i];
gl_shader_stage s = vk_to_mesa_shader_stage(stage->stage);
key.stage_info[s] = radv_pipeline_get_shader_key(device, stage, pipeline->base.create_flags, pCreateInfo->pNext);
}
return key;
}

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

@@ -2318,11 +2318,6 @@ struct radv_graphics_pipeline_create_info {
uint32_t custom_blend_mode;
};
struct radv_pipeline_key radv_generate_pipeline_key(const struct radv_device *device,
const VkPipelineShaderStageCreateInfo *stages,
const unsigned num_stages, VkPipelineCreateFlags2KHR flags,
const void *pNext);
struct radv_shader_stage_key radv_pipeline_get_shader_key(const struct radv_device *device,
const VkPipelineShaderStageCreateInfo *stage,
VkPipelineCreateFlags2KHR flags, const void *pNext);