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

radv: Remove unused pipeline param from radv_generate_pipeline_key

Browse Source 
Signed-off-by: Joshua Ashton <joshua@froggi.es>
Reviewed-by: Friedrich Vock <friedrich.vock@gmx.de>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23912>
This commit is contained in:
Joshua Ashton
2023-07-03 22:32:15 +01:00
parent 5ca8390e5f
commit 59cf3702c4
5 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -158,9 +158,8 @@ radv_convert_buffer_robustness(const struct radv_device *device, VkPipelineRobus
} }
struct radv_pipeline_key struct radv_pipeline_key
radv_generate_pipeline_key(const struct radv_device *device, const struct radv_pipeline *pipeline, radv_generate_pipeline_key(const struct radv_device *device, const VkPipelineShaderStageCreateInfo *stages,
const VkPipelineShaderStageCreateInfo *stages, const unsigned num_stages, const unsigned num_stages, VkPipelineCreateFlags flags, const void *pNext)
VkPipelineCreateFlags flags, const void *pNext)
{ {
struct radv_pipeline_key key; struct radv_pipeline_key key;

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

@@ -113,11 +113,9 @@ radv_compute_generate_pm4(const struct radv_device *device, struct radv_compute_
} }
static struct radv_pipeline_key static struct radv_pipeline_key
radv_generate_compute_pipeline_key(const struct radv_device *device, struct radv_compute_pipeline *pipeline, radv_generate_compute_pipeline_key(const struct radv_device *device, const VkComputePipelineCreateInfo *pCreateInfo)
const VkComputePipelineCreateInfo *pCreateInfo)
{ {
return radv_generate_pipeline_key(device, &pipeline->base, &pCreateInfo->stage, 1, pCreateInfo->flags, return radv_generate_pipeline_key(device, &pCreateInfo->stage, 1, pCreateInfo->flags, pCreateInfo->pNext);
pCreateInfo->pNext);
} }
void void
@@ -268,7 +266,7 @@ radv_compute_pipeline_create(VkDevice _device, VkPipelineCache _cache, const VkC
const VkPipelineCreationFeedbackCreateInfo *creation_feedback = const VkPipelineCreationFeedbackCreateInfo *creation_feedback =
vk_find_struct_const(pCreateInfo->pNext, PIPELINE_CREATION_FEEDBACK_CREATE_INFO); vk_find_struct_const(pCreateInfo->pNext, PIPELINE_CREATION_FEEDBACK_CREATE_INFO);
struct radv_pipeline_key key = radv_generate_compute_pipeline_key(device, pipeline, pCreateInfo); struct radv_pipeline_key key = radv_generate_compute_pipeline_key(device, pCreateInfo);
result = radv_compute_pipeline_compile(pipeline, pipeline_layout, device, cache, &key, &pCreateInfo->stage, result = radv_compute_pipeline_compile(pipeline, pipeline_layout, device, cache, &key, &pCreateInfo->stage,
pCreateInfo->flags, creation_feedback); pCreateInfo->flags, creation_feedback);

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

@@ -1817,8 +1817,8 @@ radv_generate_graphics_pipeline_key(const struct radv_device *device, const stru
VkGraphicsPipelineLibraryFlagBitsEXT lib_flags) VkGraphicsPipelineLibraryFlagBitsEXT lib_flags)
{ {
const struct radv_physical_device *pdevice = device->physical_device; const struct radv_physical_device *pdevice = device->physical_device;
struct radv_pipeline_key key = radv_generate_pipeline_key( struct radv_pipeline_key key = radv_generate_pipeline_key(device, pCreateInfo->pStages, pCreateInfo->stageCount,
device, &pipeline->base, pCreateInfo->pStages, pCreateInfo->stageCount, pCreateInfo->flags, pCreateInfo->pNext); pCreateInfo->flags, pCreateInfo->pNext);
key.lib_flags = lib_flags; key.lib_flags = lib_flags;
key.has_multiview_view_index = state->rp ? !!state->rp->view_mask : 0; key.has_multiview_view_index = state->rp ? !!state->rp->view_mask : 0;

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

@@ -83,12 +83,10 @@ handle_from_stages(struct radv_device *device, struct radv_ray_tracing_stage *st
} }
static struct radv_pipeline_key static struct radv_pipeline_key
radv_generate_rt_pipeline_key(const struct radv_device *device, const struct radv_ray_tracing_pipeline *rt_pipeline, radv_generate_rt_pipeline_key(const struct radv_device *device, const VkRayTracingPipelineCreateInfoKHR *pCreateInfo)
const VkRayTracingPipelineCreateInfoKHR *pCreateInfo)
{ {
struct radv_pipeline_key key = struct radv_pipeline_key key = radv_generate_pipeline_key(device, pCreateInfo->pStages, pCreateInfo->stageCount,
radv_generate_pipeline_key(device, &rt_pipeline->base.base, pCreateInfo->pStages, pCreateInfo->stageCount, pCreateInfo->flags, pCreateInfo->pNext);
pCreateInfo->flags, pCreateInfo->pNext);
if (pCreateInfo->pLibraryInfo) { if (pCreateInfo->pLibraryInfo) {
for (unsigned i = 0; i < pCreateInfo->pLibraryInfo->libraryCount; ++i) { for (unsigned i = 0; i < pCreateInfo->pLibraryInfo->libraryCount; ++i) {
@@ -573,7 +571,7 @@ radv_rt_pipeline_create(VkDevice _device, VkPipelineCache _cache, const VkRayTra
pipeline->stages = stages; pipeline->stages = stages;
pipeline->groups = groups; pipeline->groups = groups;
struct radv_pipeline_key key = radv_generate_rt_pipeline_key(device, pipeline, pCreateInfo); struct radv_pipeline_key key = radv_generate_rt_pipeline_key(device, pCreateInfo);
/* cache robustness state for making merged shaders */ /* cache robustness state for making merged shaders */
if (key.stage_info[MESA_SHADER_INTERSECTION].storage_robustness2) if (key.stage_info[MESA_SHADER_INTERSECTION].storage_robustness2)

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

@@ -2439,7 +2439,6 @@ struct radv_graphics_pipeline_create_info {
}; };
struct radv_pipeline_key radv_generate_pipeline_key(const struct radv_device *device, struct radv_pipeline_key radv_generate_pipeline_key(const struct radv_device *device,
const struct radv_pipeline *pipeline,
const VkPipelineShaderStageCreateInfo *stages, const VkPipelineShaderStageCreateInfo *stages,
const unsigned num_stages, VkPipelineCreateFlags flags, const unsigned num_stages, VkPipelineCreateFlags flags,
const void *pNext); const void *pNext);