diff --git a/src/nouveau/vulkan/nvk_buffer.h b/src/nouveau/vulkan/nvk_buffer.h
index 312e50c6117..495bb0544af 100644
--- a/src/nouveau/vulkan/nvk_buffer.h
+++ b/src/nouveau/vulkan/nvk_buffer.h
@@ -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)
diff --git a/src/nouveau/vulkan/nvk_buffer_view.h b/src/nouveau/vulkan/nvk_buffer_view.h
index b2d5206aad2..213e1567f9a 100644
--- a/src/nouveau/vulkan/nvk_buffer_view.h
+++ b/src/nouveau/vulkan/nvk_buffer_view.h
@@ -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
diff --git a/src/nouveau/vulkan/nvk_descriptor_set.h b/src/nouveau/vulkan/nvk_descriptor_set.h
index 55ebcdd6a9a..e938eac245a 100644
--- a/src/nouveau/vulkan/nvk_descriptor_set.h
+++ b/src/nouveau/vulkan/nvk_descriptor_set.h
@@ -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
diff --git a/src/nouveau/vulkan/nvk_descriptor_set_layout.h b/src/nouveau/vulkan/nvk_descriptor_set_layout.h
index 75c82794572..1a4c13d6fb3 100644
--- a/src/nouveau/vulkan/nvk_descriptor_set_layout.h
+++ b/src/nouveau/vulkan/nvk_descriptor_set_layout.h
@@ -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,
diff --git a/src/nouveau/vulkan/nvk_device_memory.h b/src/nouveau/vulkan/nvk_device_memory.h
index b1dfd48da55..3b87a2723b7 100644
--- a/src/nouveau/vulkan/nvk_device_memory.h
+++ b/src/nouveau/vulkan/nvk_device_memory.h
@@ -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;
diff --git a/src/nouveau/vulkan/nvk_event.h b/src/nouveau/vulkan/nvk_event.h
index 4f68f5dde87..aec4060f1d4 100644
--- a/src/nouveau/vulkan/nvk_event.h
+++ b/src/nouveau/vulkan/nvk_event.h
@@ -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);
diff --git a/src/nouveau/vulkan/nvk_image.h b/src/nouveau/vulkan/nvk_image.h
index 4695917930c..76d859320c1 100644
--- a/src/nouveau/vulkan/nvk_image.h
+++ b/src/nouveau/vulkan/nvk_image.h
@@ -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)
diff --git a/src/nouveau/vulkan/nvk_image_view.h b/src/nouveau/vulkan/nvk_image_view.h
index dc949c78c6a..99f6e6c3226 100644
--- a/src/nouveau/vulkan/nvk_image_view.h
+++ b/src/nouveau/vulkan/nvk_image_view.h
@@ -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,
diff --git a/src/nouveau/vulkan/nvk_query_pool.h b/src/nouveau/vulkan/nvk_query_pool.h
index a4365a1fc4b..4a3eec531ad 100644
--- a/src/nouveau/vulkan/nvk_query_pool.h
+++ b/src/nouveau/vulkan/nvk_query_pool.h
@@ -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 */
diff --git a/src/nouveau/vulkan/nvk_sampler.h b/src/nouveau/vulkan/nvk_sampler.h
index fdb213c41b9..de124ed86fb 100644
--- a/src/nouveau/vulkan/nvk_sampler.h
+++ b/src/nouveau/vulkan/nvk_sampler.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