From 862d53f00a6197a18537bf502430a8ff47c7afed Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Fri, 19 Apr 2024 13:57:57 +0200 Subject: [PATCH] radv/rt: remove unnecessary param to radv_ray_tracing_pipeline_cache_insert() Signed-off-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_pipeline_cache.c | 5 ++--- src/amd/vulkan/radv_pipeline_cache.h | 3 +-- src/amd/vulkan/radv_pipeline_rt.c | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/amd/vulkan/radv_pipeline_cache.c b/src/amd/vulkan/radv_pipeline_cache.c index 5c318eb8e21..c0430bca6ba 100644 --- a/src/amd/vulkan/radv_pipeline_cache.c +++ b/src/amd/vulkan/radv_pipeline_cache.c @@ -449,8 +449,7 @@ radv_ray_tracing_pipeline_cache_search(struct radv_device *device, struct vk_pip void radv_ray_tracing_pipeline_cache_insert(struct radv_device *device, struct vk_pipeline_cache *cache, - struct radv_ray_tracing_pipeline *pipeline, unsigned num_stages, - const unsigned char *sha1) + struct radv_ray_tracing_pipeline *pipeline, unsigned num_stages) { if (device->cache_disabled) return; @@ -474,7 +473,7 @@ radv_ray_tracing_pipeline_cache_insert(struct radv_device *device, struct vk_pip num_stages * sizeof(struct radv_ray_tracing_stage_cache_data); struct radv_pipeline_cache_object *pipeline_obj = - radv_pipeline_cache_object_create(&device->vk, num_shaders, sha1, data_size); + radv_pipeline_cache_object_create(&device->vk, num_shaders, pipeline->sha1, data_size); struct radv_ray_tracing_pipeline_cache_data *data = pipeline_obj->data; data->has_traversal_shader = !!pipeline->base.base.shaders[MESA_SHADER_INTERSECTION]; diff --git a/src/amd/vulkan/radv_pipeline_cache.h b/src/amd/vulkan/radv_pipeline_cache.h index b06bfb448bf..1c9046004b2 100644 --- a/src/amd/vulkan/radv_pipeline_cache.h +++ b/src/amd/vulkan/radv_pipeline_cache.h @@ -55,8 +55,7 @@ bool radv_ray_tracing_pipeline_cache_search(struct radv_device *device, struct v bool *found_in_application_cache); void radv_ray_tracing_pipeline_cache_insert(struct radv_device *device, struct vk_pipeline_cache *cache, - struct radv_ray_tracing_pipeline *pipeline, unsigned num_stages, - const unsigned char *sha1); + struct radv_ray_tracing_pipeline *pipeline, unsigned num_stages); nir_shader *radv_pipeline_cache_lookup_nir(struct radv_device *device, struct vk_pipeline_cache *cache, gl_shader_stage stage, const blake3_hash key); diff --git a/src/amd/vulkan/radv_pipeline_rt.c b/src/amd/vulkan/radv_pipeline_rt.c index fa717f9c177..cab5ba71bbe 100644 --- a/src/amd/vulkan/radv_pipeline_rt.c +++ b/src/amd/vulkan/radv_pipeline_rt.c @@ -873,7 +873,7 @@ radv_rt_pipeline_compile(struct radv_device *device, const VkRayTracingPipelineC return result; if (!skip_shaders_cache) - radv_ray_tracing_pipeline_cache_insert(device, cache, pipeline, pCreateInfo->stageCount, pipeline->sha1); + radv_ray_tracing_pipeline_cache_insert(device, cache, pipeline, pCreateInfo->stageCount); done: pipeline_feedback.duration = os_time_get_nano() - pipeline_start;