From d963cca82f4d503f883451e410f78f68c54480a8 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Wed, 3 Sep 2025 11:29:18 +0200 Subject: [PATCH] pvr: move event/sampler cast defs to correct header This struct is defined in pvr_common.h, so we should have the cast definitions in the same header. Reviewed-by: Simon Perretta Part-of: --- src/imagination/vulkan/pvr_common.h | 6 ++++++ src/imagination/vulkan/pvr_private.h | 5 ----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/imagination/vulkan/pvr_common.h b/src/imagination/vulkan/pvr_common.h index 753af462c77..b676ba486ff 100644 --- a/src/imagination/vulkan/pvr_common.h +++ b/src/imagination/vulkan/pvr_common.h @@ -333,4 +333,10 @@ struct pvr_descriptor_state { #undef PVR_MAX_DYNAMIC_BUFFERS +VK_DEFINE_NONDISP_HANDLE_CASTS(pvr_event, base, VkEvent, VK_OBJECT_TYPE_EVENT) +VK_DEFINE_NONDISP_HANDLE_CASTS(pvr_sampler, + vk.base, + VkSampler, + VK_OBJECT_TYPE_SAMPLER) + #endif /* PVR_COMMON_H */ diff --git a/src/imagination/vulkan/pvr_private.h b/src/imagination/vulkan/pvr_private.h index ff1f9bdbda9..7dff176980f 100644 --- a/src/imagination/vulkan/pvr_private.h +++ b/src/imagination/vulkan/pvr_private.h @@ -1475,15 +1475,10 @@ VK_DEFINE_NONDISP_HANDLE_CASTS(pvr_descriptor_set, base, VkDescriptorSet, VK_OBJECT_TYPE_DESCRIPTOR_SET) -VK_DEFINE_NONDISP_HANDLE_CASTS(pvr_event, base, VkEvent, VK_OBJECT_TYPE_EVENT) VK_DEFINE_NONDISP_HANDLE_CASTS(pvr_descriptor_pool, base, VkDescriptorPool, VK_OBJECT_TYPE_DESCRIPTOR_POOL) -VK_DEFINE_NONDISP_HANDLE_CASTS(pvr_sampler, - vk.base, - VkSampler, - VK_OBJECT_TYPE_SAMPLER) VK_DEFINE_NONDISP_HANDLE_CASTS(pvr_pipeline, base, VkPipeline,