nvk: Fix some cast defines

This removes compiler warnings on 32-bit builds 🐸 Also other drivers do define casts this way, so this should actually be an uncontroversial change 😁 Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>
2023-03-28 00:03:33 +03:00
parent 3ecf6db521
commit bd1ff51b77
10 changed files with 15 additions and 15 deletions
@@ -15,7 +15,7 @@ struct nvk_buffer {
   uint64_t addr;
 };

-VK_DEFINE_HANDLE_CASTS(nvk_buffer, vk.base, VkBuffer, VK_OBJECT_TYPE_BUFFER)
+VK_DEFINE_NONDISP_HANDLE_CASTS(nvk_buffer, vk.base, VkBuffer, VK_OBJECT_TYPE_BUFFER)

 static inline uint64_t
 nvk_buffer_address(const struct nvk_buffer *buffer, uint64_t offset)
@@ -18,7 +18,7 @@ struct nvk_buffer_view {
   uint32_t desc_index;
 };

-VK_DEFINE_HANDLE_CASTS(nvk_buffer_view, vk.base, VkBufferView,
-                       VK_OBJECT_TYPE_BUFFER_VIEW)
+VK_DEFINE_NONDISP_HANDLE_CASTS(nvk_buffer_view, vk.base, VkBufferView,
+                               VK_OBJECT_TYPE_BUFFER_VIEW)

 #endif
@@ -56,7 +56,7 @@ struct nvk_descriptor_set {
   struct nvk_buffer_address dynamic_buffers[];
 };

-VK_DEFINE_HANDLE_CASTS(nvk_descriptor_set, base, VkDescriptorSet,
+VK_DEFINE_NONDISP_HANDLE_CASTS(nvk_descriptor_set, base, VkDescriptorSet,
                       VK_OBJECT_TYPE_DESCRIPTOR_SET)

 static inline uint64_t
@@ -52,9 +52,9 @@ struct nvk_descriptor_set_layout {
   struct nvk_descriptor_set_binding_layout binding[0];
 };

-VK_DEFINE_HANDLE_CASTS(nvk_descriptor_set_layout, vk.base,
-                       VkDescriptorSetLayout,
-                       VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT)
+VK_DEFINE_NONDISP_HANDLE_CASTS(nvk_descriptor_set_layout, vk.base,
+                               VkDescriptorSetLayout,
+                               VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT)

 void nvk_descriptor_stride_align_for_type(VkDescriptorType type,
                                          const VkMutableDescriptorTypeListEXT *type_list,
@@ -17,7 +17,7 @@ struct nvk_device_memory {
   void *map;
 };

-VK_DEFINE_HANDLE_CASTS(nvk_device_memory, base, VkDeviceMemory, VK_OBJECT_TYPE_DEVICE_MEMORY)
+VK_DEFINE_NONDISP_HANDLE_CASTS(nvk_device_memory, base, VkDeviceMemory, VK_OBJECT_TYPE_DEVICE_MEMORY)

 struct nvk_memory_tiling_info {
   uint16_t tile_mode;
@@ -12,7 +12,7 @@ struct nvk_event {
   VkResult *status;
 };

-VK_DEFINE_HANDLE_CASTS(nvk_event, base, VkEvent, VK_OBJECT_TYPE_EVENT)
+VK_DEFINE_NONDISP_HANDLE_CASTS(nvk_event, base, VkEvent, VK_OBJECT_TYPE_EVENT)

 uint32_t
 vk_stage_flags_to_nv9097_pipeline_location(VkPipelineStageFlags2 flags);
@@ -26,7 +26,7 @@ struct nvk_image {
   struct nil_image nil;
 };

-VK_DEFINE_HANDLE_CASTS(nvk_image, vk.base, VkImage, VK_OBJECT_TYPE_IMAGE)
+VK_DEFINE_NONDISP_HANDLE_CASTS(nvk_image, vk.base, VkImage, VK_OBJECT_TYPE_IMAGE)

 static inline uint64_t
 nvk_image_base_address(const struct nvk_image *image)
@@ -17,8 +17,8 @@ struct nvk_image_view {
   uint32_t storage_desc_index;
 };

-VK_DEFINE_HANDLE_CASTS(nvk_image_view, vk.base, VkImageView,
-                       VK_OBJECT_TYPE_IMAGE_VIEW)
+VK_DEFINE_NONDISP_HANDLE_CASTS(nvk_image_view, vk.base, VkImageView,
+                               VK_OBJECT_TYPE_IMAGE_VIEW)

 VkResult nvk_image_view_init(struct nvk_device *device,
                             struct nvk_image_view *view,
@@ -17,7 +17,7 @@ struct nvk_query_pool {
   void *bo_map;
 };

-VK_DEFINE_HANDLE_CASTS(nvk_query_pool, vk.base, VkQueryPool,
-                       VK_OBJECT_TYPE_QUERY_POOL)
+VK_DEFINE_NONDISP_HANDLE_CASTS(nvk_query_pool, vk.base, VkQueryPool,
+                               VK_OBJECT_TYPE_QUERY_POOL)

 #endif /* NVK_QUERY_POOL_H */
@@ -11,6 +11,6 @@ struct nvk_sampler {
   uint32_t desc_index;
 };

-VK_DEFINE_HANDLE_CASTS(nvk_sampler, base, VkSampler, VK_OBJECT_TYPE_SAMPLER)
+VK_DEFINE_NONDISP_HANDLE_CASTS(nvk_sampler, base, VkSampler, VK_OBJECT_TYPE_SAMPLER)

 #endif