panvk: port panvk_logi to vk_logi

Signed-off-by: Hui Ni <shuizhuyuanluo@126.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22772>

diff --git a/src/panfrost/vulkan/meson.build b/src/panfrost/vulkan/meson.build
index ac975cc..e3f5903 100644 (file)
--- a/src/panfrost/vulkan/meson.build
+++ b/src/panfrost/vulkan/meson.build
@@ -48,7 +48,6 @@ libpanvk_files = files(
   'panvk_private.h',
   'panvk_query.c',
   'panvk_shader.c',
-  'panvk_util.c',
   'panvk_wsi.c',
 ) + [vk_cmd_enqueue_entrypoints[0], vk_common_entrypoints[0]]
 

diff --git a/src/panfrost/vulkan/panvk_device.c b/src/panfrost/vulkan/panvk_device.c
index d0ffb38..9df451e 100644 (file)
--- a/src/panfrost/vulkan/panvk_device.c
+++ b/src/panfrost/vulkan/panvk_device.c
@@ -344,7 +344,7 @@ panvk_CreateInstance(const VkInstanceCreateInfo *pCreateInfo,
       parse_debug_string(getenv("PANVK_DEBUG"), panvk_debug_options);
 
    if (instance->debug_flags & PANVK_DEBUG_STARTUP)
-      panvk_logi("Created an instance");
+      vk_logi(VK_LOG_NO_OBJS(instance), "Created an instance");
 
    VG(VALGRIND_CREATE_MEMPOOL(instance, 0, false));
 
@@ -409,7 +409,7 @@ panvk_physical_device_init(struct panvk_physical_device *device,
    drmFreeVersion(version);
 
    if (instance->debug_flags & PANVK_DEBUG_STARTUP)
-      panvk_logi("Found compatible device '%s'.", path);
+      vk_logi(VK_LOG_NO_OBJS(instance), "Found compatible device '%s'.", path);
 
    struct vk_device_extension_table supported_extensions;
    panvk_get_device_extensions(device, &supported_extensions);

diff --git a/src/panfrost/vulkan/panvk_private.h b/src/panfrost/vulkan/panvk_private.h
index aca7bb4..4511a78 100644 (file)
--- a/src/panfrost/vulkan/panvk_private.h
+++ b/src/panfrost/vulkan/panvk_private.h
@@ -112,11 +112,6 @@ typedef uint32_t xcb_window_t;
 #define PANVK_PUSH_CONST_UBO_INDEX 1
 #define PANVK_NUM_BUILTIN_UBOS     2
 
-#define panvk_printflike(a, b) __attribute__((__format__(__printf__, a, b)))
-
-void panvk_logi(const char *format, ...) panvk_printflike(1, 2);
-void panvk_logi_v(const char *format, va_list va);
-
 #define panvk_stub() assert(!"stub")
 
 #define PANVK_META_COPY_BUF2IMG_NUM_FORMATS  12

diff --git a/src/panfrost/vulkan/panvk_util.c b/src/panfrost/vulkan/panvk_util.c
deleted file mode 100644 (file)
index c356bbd..0000000
--- a/src/panfrost/vulkan/panvk_util.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright © 2015 Collabora Ltd.
- *
- * Derived from tu_util.c which is:
- * Copyright © 2015 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-#include "panvk_private.h"
-
-#include <assert.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "util/u_math.h"
-#include "vk_enum_to_str.h"
-
-/** Log an error message.  */
-void panvk_printflike(1, 2) panvk_logi(const char *format, ...)
-{
-   va_list va;
-
-   va_start(va, format);
-   panvk_logi_v(format, va);
-   va_end(va);
-}
-
-/** \see panvk_logi() */
-void
-panvk_logi_v(const char *format, va_list va)
-{
-   fprintf(stderr, "tu: info: ");
-   vfprintf(stderr, format, va);
-   fprintf(stderr, "\n");
-}