radv/rt: change base of radv_ray_tracing_lib_pipeline to radv_compute_pipeline

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22503>

diff --git a/src/amd/vulkan/radv_pipeline_rt.c b/src/amd/vulkan/radv_pipeline_rt.c
index e3f3c6a..3604396 100644 (file)
--- a/src/amd/vulkan/radv_pipeline_rt.c
+++ b/src/amd/vulkan/radv_pipeline_rt.c
@@ -424,10 +424,10 @@ radv_rt_pipeline_library_create(VkDevice _device, VkPipelineCache _cache,
    if (!pipeline)
       return VK_ERROR_OUT_OF_HOST_MEMORY;
 
-   radv_pipeline_init(device, &pipeline->base, RADV_PIPELINE_RAY_TRACING_LIB);
+   radv_pipeline_init(device, &pipeline->base.base, RADV_PIPELINE_RAY_TRACING_LIB);
 
    struct radv_pipeline_key key =
-      radv_generate_pipeline_key(device, &pipeline->base, pCreateInfo->flags);
+      radv_generate_pipeline_key(device, &pipeline->base.base, pCreateInfo->flags);
 
    pipeline->ctx = ralloc_context(NULL);
    pipeline->group_count = local_create_info.groupCount;
@@ -454,7 +454,7 @@ radv_rt_pipeline_library_create(VkDevice _device, VkPipelineCache _cache,
    radv_hash_rt_shaders(pipeline->sha1, pCreateInfo, &key, pipeline->groups,
                         radv_get_hash_flags(device, keep_statistic_info));
 
-   *pPipeline = radv_pipeline_to_handle(&pipeline->base);
+   *pPipeline = radv_pipeline_to_handle(&pipeline->base.base);
 
    if (creation_feedback) {
       pipeline_feedback.duration = os_time_get_nano() - pipeline_start;
@@ -463,7 +463,7 @@ radv_rt_pipeline_library_create(VkDevice _device, VkPipelineCache _cache,
 
 pipeline_fail:
    if (result != VK_SUCCESS)
-      radv_pipeline_destroy(device, &pipeline->base, pAllocator);
+      radv_pipeline_destroy(device, &pipeline->base.base, pAllocator);
    return result;
 }
 

diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h
index 1a42683..b80d717 100644 (file)
--- a/src/amd/vulkan/radv_private.h
+++ b/src/amd/vulkan/radv_private.h
@@ -2325,7 +2325,7 @@ struct radv_ray_tracing_stage {
 };
 
 struct radv_ray_tracing_lib_pipeline {
-   struct radv_pipeline base;
+   struct radv_compute_pipeline base;
 
    /* ralloc context used for allocating pipeline library resources. */
    void *ctx;