From b4e7981996cb7a9c6636da4be707b5b648dede91 Mon Sep 17 00:00:00 2001 From: Christian Gmeiner Date: Fri, 31 Oct 2025 19:09:59 +0100 Subject: [PATCH] anv: Convert DEBUG_SPARSE logging to use mesa_logi Use mesa_logi_v(..) in sparse_debug(..). Signed-off-by: Christian Gmeiner Reviewed-by: Lionel Landwerlin Reviewed-by: Paulo Zanoni Part-of: --- src/intel/vulkan/anv_batch_chain.c | 20 ++++++++++---------- src/intel/vulkan/anv_buffer.c | 8 ++++---- src/intel/vulkan/anv_formats.c | 2 +- src/intel/vulkan/anv_image.c | 12 ++++++------ src/intel/vulkan/anv_sparse.c | 2 +- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/intel/vulkan/anv_batch_chain.c b/src/intel/vulkan/anv_batch_chain.c index 80a604ea137..185b597494d 100644 --- a/src/intel/vulkan/anv_batch_chain.c +++ b/src/intel/vulkan/anv_batch_chain.c @@ -1399,22 +1399,22 @@ anv_queue_submit_sparse_bind(struct anv_queue *queue, */ if (device->physical->sparse_type == ANV_SPARSE_TYPE_NOT_SUPPORTED) { if (INTEL_DEBUG(DEBUG_SPARSE)) - fprintf(stderr, "=== application submitting sparse operations: " - "buffer_bind:%d image_opaque_bind:%d image_bind:%d\n", - submit->buffer_bind_count, submit->image_opaque_bind_count, - submit->image_bind_count); + mesa_logi("=== application submitting sparse operations: " + "buffer_bind:%d image_opaque_bind:%d image_bind:%d\n", + submit->buffer_bind_count, submit->image_opaque_bind_count, + submit->image_bind_count); return vk_queue_set_lost(&queue->vk, "Sparse binding not supported"); } assert(submit->command_buffer_count == 0); if (INTEL_DEBUG(DEBUG_SPARSE)) { - fprintf(stderr, "[sparse submission, buffers:%u opaque_images:%u " - "images:%u waits:%u signals:%u]\n", - submit->buffer_bind_count, - submit->image_opaque_bind_count, - submit->image_bind_count, - submit->wait_count, submit->signal_count); + mesa_logi("[sparse submission, buffers:%u opaque_images:%u " + "images:%u waits:%u signals:%u]\n", + submit->buffer_bind_count, + submit->image_opaque_bind_count, + submit->image_bind_count, + submit->wait_count, submit->signal_count); } struct anv_sparse_submission sparse_submit = { diff --git a/src/intel/vulkan/anv_buffer.c b/src/intel/vulkan/anv_buffer.c index 58f4b8efbd6..30e5db6ec90 100644 --- a/src/intel/vulkan/anv_buffer.c +++ b/src/intel/vulkan/anv_buffer.c @@ -154,8 +154,8 @@ void anv_GetDeviceBufferMemoryRequirements( pInfo->pCreateInfo->flags & (VK_BUFFER_CREATE_SPARSE_BINDING_BIT | VK_BUFFER_CREATE_SPARSE_RESIDENCY_BIT | VK_BUFFER_CREATE_SPARSE_ALIASED_BIT)) - fprintf(stderr, "=== %s %s:%d flags:0x%08x\n", __func__, __FILE__, - __LINE__, pInfo->pCreateInfo->flags); + mesa_logi("=== %s %s:%d flags:0x%08x\n", __func__, __FILE__, + __LINE__, pInfo->pCreateInfo->flags); anv_get_buffer_memory_requirements(device, pInfo->pCreateInfo->flags, @@ -179,8 +179,8 @@ VkResult anv_CreateBuffer( pCreateInfo->flags & (VK_BUFFER_CREATE_SPARSE_BINDING_BIT | VK_BUFFER_CREATE_SPARSE_RESIDENCY_BIT | VK_BUFFER_CREATE_SPARSE_ALIASED_BIT)) - fprintf(stderr, "=== %s %s:%d flags:0x%08x\n", __func__, __FILE__, - __LINE__, pCreateInfo->flags); + mesa_logi("=== %s %s:%d flags:0x%08x\n", __func__, __FILE__, + __LINE__, pCreateInfo->flags); if ((pCreateInfo->flags & VK_BUFFER_CREATE_SPARSE_BINDING_BIT) && device->physical->sparse_type == ANV_SPARSE_TYPE_TRTT) { diff --git a/src/intel/vulkan/anv_formats.c b/src/intel/vulkan/anv_formats.c index 84f0229e94e..1a28ec923ee 100644 --- a/src/intel/vulkan/anv_formats.c +++ b/src/intel/vulkan/anv_formats.c @@ -2117,7 +2117,7 @@ void anv_GetPhysicalDeviceSparseImageFormatProperties2( if (physical_device->sparse_type == ANV_SPARSE_TYPE_NOT_SUPPORTED) { if (INTEL_DEBUG(DEBUG_SPARSE)) - fprintf(stderr, "=== [%s:%d] [%s]\n", __FILE__, __LINE__, __func__); + mesa_logi("=== [%s:%d] [%s]\n", __FILE__, __LINE__, __func__); return; } diff --git a/src/intel/vulkan/anv_image.c b/src/intel/vulkan/anv_image.c index c73f9f022c7..736ebf048ea 100644 --- a/src/intel/vulkan/anv_image.c +++ b/src/intel/vulkan/anv_image.c @@ -2287,8 +2287,8 @@ VkResult anv_CreateImage( pCreateInfo->flags & (VK_IMAGE_CREATE_SPARSE_BINDING_BIT | VK_IMAGE_CREATE_SPARSE_RESIDENCY_BIT | VK_IMAGE_CREATE_SPARSE_ALIASED_BIT)) - fprintf(stderr, "=== %s %s:%d flags:0x%08x\n", __func__, __FILE__, - __LINE__, pCreateInfo->flags); + mesa_logi("=== %s %s:%d flags:0x%08x\n", __func__, __FILE__, + __LINE__, pCreateInfo->flags); #ifndef VK_USE_PLATFORM_ANDROID_KHR /* Skip the WSI common swapchain creation here on Android. Similar to ahb, @@ -2718,8 +2718,8 @@ void anv_GetDeviceImageMemoryRequirements( pInfo->pCreateInfo->flags & (VK_IMAGE_CREATE_SPARSE_BINDING_BIT | VK_IMAGE_CREATE_SPARSE_RESIDENCY_BIT | VK_IMAGE_CREATE_SPARSE_ALIASED_BIT)) - fprintf(stderr, "=== %s %s:%d flags:0x%08x\n", __func__, __FILE__, - __LINE__, pInfo->pCreateInfo->flags); + mesa_logi("=== %s %s:%d flags:0x%08x\n", __func__, __FILE__, + __LINE__, pInfo->pCreateInfo->flags); ASSERTED VkResult result = anv_image_init_from_create_info(device, &image, pInfo->pCreateInfo, true); @@ -2826,7 +2826,7 @@ void anv_GetImageSparseMemoryRequirements2( if (!anv_sparse_residency_is_enabled(device)) { if ((device->physical->sparse_type == ANV_SPARSE_TYPE_NOT_SUPPORTED) && INTEL_DEBUG(DEBUG_SPARSE)) - fprintf(stderr, "=== [%s:%d] [%s]\n", __FILE__, __LINE__, __func__); + mesa_logi("=== [%s:%d] [%s]\n", __FILE__, __LINE__, __func__); *pSparseMemoryRequirementCount = 0; return; @@ -2849,7 +2849,7 @@ void anv_GetDeviceImageSparseMemoryRequirements( if (!anv_sparse_residency_is_enabled(device)) { if ((device->physical->sparse_type == ANV_SPARSE_TYPE_NOT_SUPPORTED) && INTEL_DEBUG(DEBUG_SPARSE)) - fprintf(stderr, "=== [%s:%d] [%s]\n", __FILE__, __LINE__, __func__); + mesa_logi("=== [%s:%d] [%s]\n", __FILE__, __LINE__, __func__); *pSparseMemoryRequirementCount = 0; return; diff --git a/src/intel/vulkan/anv_sparse.c b/src/intel/vulkan/anv_sparse.c index 1710cbb6461..ac563969b6d 100644 --- a/src/intel/vulkan/anv_sparse.c +++ b/src/intel/vulkan/anv_sparse.c @@ -44,7 +44,7 @@ sparse_debug(const char *format, ...) va_list args; va_start(args, format); - vfprintf(stderr, format, args); + mesa_logi_v(format, args); va_end(args); }