From cd6dfd6c2de3f94560c79ff525e3f8be03ec25a6 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Wed, 1 May 2024 13:26:16 -0400 Subject: [PATCH] nvk: use common stype debug Signed-off-by: Alyssa Rosenzweig Reviewed-by: Faith Ekstrand Part-of: --- src/nouveau/vulkan/nvk_buffer.c | 2 +- src/nouveau/vulkan/nvk_cmd_copy.c | 8 ++++---- src/nouveau/vulkan/nvk_descriptor_set_layout.c | 2 +- src/nouveau/vulkan/nvk_format.c | 2 +- src/nouveau/vulkan/nvk_image.c | 4 ++-- src/nouveau/vulkan/nvk_physical_device.c | 2 +- src/nouveau/vulkan/nvk_private.h | 18 ------------------ 7 files changed, 10 insertions(+), 28 deletions(-) diff --git a/src/nouveau/vulkan/nvk_buffer.c b/src/nouveau/vulkan/nvk_buffer.c index 24c8307fea97f..d03bb58e8ad6e 100644 --- a/src/nouveau/vulkan/nvk_buffer.c +++ b/src/nouveau/vulkan/nvk_buffer.c @@ -179,7 +179,7 @@ nvk_GetDeviceBufferMemoryRequirements( break; } default: - nvk_debug_ignored_stype(ext->sType); + vk_debug_ignored_stype(ext->sType); break; } } diff --git a/src/nouveau/vulkan/nvk_cmd_copy.c b/src/nouveau/vulkan/nvk_cmd_copy.c index 463390ab67f27..de9530cd24dc3 100644 --- a/src/nouveau/vulkan/nvk_cmd_copy.c +++ b/src/nouveau/vulkan/nvk_cmd_copy.c @@ -471,7 +471,7 @@ nvk_CmdCopyBufferToImage2(VkCommandBuffer commandBuffer, vk_foreach_struct_const(ext, region->pNext) { switch (ext->sType) { default: - nvk_debug_ignored_stype(ext->sType); + vk_debug_ignored_stype(ext->sType); break; } } @@ -480,7 +480,7 @@ nvk_CmdCopyBufferToImage2(VkCommandBuffer commandBuffer, vk_foreach_struct_const(ext, pCopyBufferToImageInfo->pNext) { switch (ext->sType) { default: - nvk_debug_ignored_stype(ext->sType); + vk_debug_ignored_stype(ext->sType); break; } } @@ -578,7 +578,7 @@ nvk_CmdCopyImageToBuffer2(VkCommandBuffer commandBuffer, vk_foreach_struct_const(ext, region->pNext) { switch (ext->sType) { default: - nvk_debug_ignored_stype(ext->sType); + vk_debug_ignored_stype(ext->sType); break; } } @@ -587,7 +587,7 @@ nvk_CmdCopyImageToBuffer2(VkCommandBuffer commandBuffer, vk_foreach_struct_const(ext, pCopyImageToBufferInfo->pNext) { switch (ext->sType) { default: - nvk_debug_ignored_stype(ext->sType); + vk_debug_ignored_stype(ext->sType); break; } } diff --git a/src/nouveau/vulkan/nvk_descriptor_set_layout.c b/src/nouveau/vulkan/nvk_descriptor_set_layout.c index d28a21dc6a2a0..2f331442e6240 100644 --- a/src/nouveau/vulkan/nvk_descriptor_set_layout.c +++ b/src/nouveau/vulkan/nvk_descriptor_set_layout.c @@ -412,7 +412,7 @@ nvk_GetDescriptorSetLayoutSupport(VkDevice device, } default: - nvk_debug_ignored_stype(ext->sType); + vk_debug_ignored_stype(ext->sType); break; } } diff --git a/src/nouveau/vulkan/nvk_format.c b/src/nouveau/vulkan/nvk_format.c index 6b7a93719b52b..beaeac898d4dc 100644 --- a/src/nouveau/vulkan/nvk_format.c +++ b/src/nouveau/vulkan/nvk_format.c @@ -183,7 +183,7 @@ nvk_GetPhysicalDeviceFormatProperties2(VkPhysicalDevice physicalDevice, } default: - nvk_debug_ignored_stype(ext->sType); + vk_debug_ignored_stype(ext->sType); break; } } diff --git a/src/nouveau/vulkan/nvk_image.c b/src/nouveau/vulkan/nvk_image.c index 77eb955263fd7..1fa96dc595951 100644 --- a/src/nouveau/vulkan/nvk_image.c +++ b/src/nouveau/vulkan/nvk_image.c @@ -439,7 +439,7 @@ nvk_GetPhysicalDeviceImageFormatProperties2( break; } default: - nvk_debug_ignored_stype(s->sType); + vk_debug_ignored_stype(s->sType); break; } } @@ -821,7 +821,7 @@ nvk_get_image_memory_requirements(struct nvk_device *dev, break; } default: - nvk_debug_ignored_stype(ext->sType); + vk_debug_ignored_stype(ext->sType); break; } } diff --git a/src/nouveau/vulkan/nvk_physical_device.c b/src/nouveau/vulkan/nvk_physical_device.c index c5c5f50b3bbb5..ade26161536ff 100644 --- a/src/nouveau/vulkan/nvk_physical_device.c +++ b/src/nouveau/vulkan/nvk_physical_device.c @@ -1432,7 +1432,7 @@ nvk_GetPhysicalDeviceMemoryProperties2( break; } default: - nvk_debug_ignored_stype(ext->sType); + vk_debug_ignored_stype(ext->sType); break; } } diff --git a/src/nouveau/vulkan/nvk_private.h b/src/nouveau/vulkan/nvk_private.h index d782512145574..3e6b96ba22d52 100644 --- a/src/nouveau/vulkan/nvk_private.h +++ b/src/nouveau/vulkan/nvk_private.h @@ -39,22 +39,4 @@ struct nvk_addr_range { uint64_t range; }; -/** - * Warn on ignored extension structs. - * - * The Vulkan spec requires us to ignore unsupported or unknown structs in - * a pNext chain. In debug mode, emitting warnings for ignored structs may - * help us discover structs that we should not have ignored. - * - * - * From the Vulkan 1.0.38 spec: - * - * Any component of the implementation (the loader, any enabled layers, - * and drivers) must skip over, without processing (other than reading the - * sType and pNext members) any chained structures with sType values not - * defined by extensions supported by that component. - */ -#define nvk_debug_ignored_stype(sType) \ - mesa_logd("%s: ignored VkStructureType %u\n", __func__, (sType)) - #endif