From edac80d8a7d25f9928308037b46a91dca8a9bc15 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Wed, 1 May 2024 13:35:11 -0400 Subject: [PATCH] broadcom: use common stype debug Signed-off-by: Alyssa Rosenzweig Acked-by: Faith Ekstrand Part-of: --- src/broadcom/vulkan/v3dv_device.c | 12 ++++++------ src/broadcom/vulkan/v3dv_formats.c | 6 +++--- src/broadcom/vulkan/v3dv_private.h | 3 --- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/broadcom/vulkan/v3dv_device.c b/src/broadcom/vulkan/v3dv_device.c index 355145515fe72..1873a6af4c2c2 100644 --- a/src/broadcom/vulkan/v3dv_device.c +++ b/src/broadcom/vulkan/v3dv_device.c @@ -1537,7 +1537,7 @@ v3dv_GetPhysicalDeviceQueueFamilyProperties2(VkPhysicalDevice physicalDevice, p->queueFamilyProperties = v3dv_queue_family_properties; vk_foreach_struct(s, p->pNext) { - v3dv_debug_ignored_stype(s->sType); + vk_debug_ignored_stype(s->sType); } } } @@ -1577,7 +1577,7 @@ v3dv_GetPhysicalDeviceMemoryProperties2(VkPhysicalDevice physicalDevice, break; } default: - v3dv_debug_ignored_stype(ext->sType); + vk_debug_ignored_stype(ext->sType); break; } } @@ -2149,7 +2149,7 @@ v3dv_AllocateMemory(VkDevice _device, */ break; default: - v3dv_debug_ignored_stype(ext->sType); + vk_debug_ignored_stype(ext->sType); break; } } @@ -2302,7 +2302,7 @@ get_image_memory_requirements(struct v3dv_image *image, break; } default: - v3dv_debug_ignored_stype(ext->sType); + vk_debug_ignored_stype(ext->sType); break; } } @@ -2325,7 +2325,7 @@ v3dv_GetImageMemoryRequirements2(VkDevice device, break; } default: - v3dv_debug_ignored_stype(ext->sType); + vk_debug_ignored_stype(ext->sType); break; } } @@ -2527,7 +2527,7 @@ get_buffer_memory_requirements(struct v3dv_buffer *buffer, break; } default: - v3dv_debug_ignored_stype(ext->sType); + vk_debug_ignored_stype(ext->sType); break; } } diff --git a/src/broadcom/vulkan/v3dv_formats.c b/src/broadcom/vulkan/v3dv_formats.c index 4d8f648d26a14..337d09cb06bca 100644 --- a/src/broadcom/vulkan/v3dv_formats.c +++ b/src/broadcom/vulkan/v3dv_formats.c @@ -407,7 +407,7 @@ v3dv_GetPhysicalDeviceFormatProperties2(VkPhysicalDevice physicalDevice, break; } default: - v3dv_debug_ignored_stype(ext->sType); + vk_debug_ignored_stype(ext->sType); break; } } @@ -692,7 +692,7 @@ v3dv_GetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice physicalDevice, } break; default: - v3dv_debug_ignored_stype(s->sType); + vk_debug_ignored_stype(s->sType); break; } } @@ -713,7 +713,7 @@ v3dv_GetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice physicalDevice, ycbcr_props = (void *) s; break; default: - v3dv_debug_ignored_stype(s->sType); + vk_debug_ignored_stype(s->sType); break; } } diff --git a/src/broadcom/vulkan/v3dv_private.h b/src/broadcom/vulkan/v3dv_private.h index 02fb52527b8d0..7d1078f76a291 100644 --- a/src/broadcom/vulkan/v3dv_private.h +++ b/src/broadcom/vulkan/v3dv_private.h @@ -2394,9 +2394,6 @@ const nir_shader_compiler_options *v3dv_pipeline_get_nir_options(void); uint32_t v3dv_physical_device_vendor_id(const struct v3dv_physical_device *dev); uint32_t v3dv_physical_device_device_id(const struct v3dv_physical_device *dev); -#define v3dv_debug_ignored_stype(sType) \ - mesa_logd("%s: ignored VkStructureType %u:%s\n\n", __func__, (sType), vk_StructureType_to_str(sType)) - const uint8_t *v3dv_get_format_swizzle(struct v3dv_device *device, VkFormat f, uint8_t plane); const struct v3dv_format *