Mesa (master): v3dv/util: remove several logging functions

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Mon Nov 9 13:01:59 UTC 2020


Module: Mesa
Branch: master
Commit: 1fa4a372568ae9666a00ba01cd6ef8a692aab8db
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1fa4a372568ae9666a00ba01cd6ef8a692aab8db

Author: Alejandro Piñeiro <apinheiro at igalia.com>
Date:   Sun Nov  8 22:44:40 2020 +0100

v3dv/util: remove several logging functions

We already have vk_error to report errors, they add little specific
v3dv wrapping over a simple fprintf, and they are not used really
often.

Reviewed-by: Iago Toral Quiroga <itoral at igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7497>

---

 src/broadcom/vulkan/v3dv_private.h |  7 +------
 src/broadcom/vulkan/v3dv_util.c    | 20 --------------------
 2 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/src/broadcom/vulkan/v3dv_private.h b/src/broadcom/vulkan/v3dv_private.h
index e6e2b5d5db9..96dbedbc10d 100644
--- a/src/broadcom/vulkan/v3dv_private.h
+++ b/src/broadcom/vulkan/v3dv_private.h
@@ -1762,8 +1762,6 @@ v3dv_device_entrypoint_is_enabled(int index, uint32_t core_version,
 void *v3dv_lookup_entrypoint(const struct v3d_device_info *devinfo,
                              const char *name);
 
-#define v3dv_printflike(a, b) __attribute__((__format__(__printf__, a, b)))
-
 VkResult __vk_errorf(struct v3dv_instance *instance, VkResult error,
                      const char *file, int line,
                      const char *format, ...);
@@ -1771,11 +1769,8 @@ VkResult __vk_errorf(struct v3dv_instance *instance, VkResult error,
 #define vk_error(instance, error) __vk_errorf(instance, error, __FILE__, __LINE__, NULL);
 #define vk_errorf(instance, error, format, ...) __vk_errorf(instance, error, __FILE__, __LINE__, format, ## __VA_ARGS__);
 
-void v3dv_loge(const char *format, ...) v3dv_printflike(1, 2);
-void v3dv_loge_v(const char *format, va_list va);
-
 #define v3dv_debug_ignored_stype(sType) \
-   v3dv_loge("%s: ignored VkStructureType %u:%s\n", __func__, (sType), vk_StructureType_to_str(sType))
+   fprintf(stderr, "%s: ignored VkStructureType %u:%s\n\n", __func__, (sType), vk_StructureType_to_str(sType))
 
 const struct v3dv_format *v3dv_get_format(VkFormat);
 const uint8_t *v3dv_get_format_swizzle(VkFormat f);
diff --git a/src/broadcom/vulkan/v3dv_util.c b/src/broadcom/vulkan/v3dv_util.c
index 3ab04c08d2f..a1fe59e99b6 100644
--- a/src/broadcom/vulkan/v3dv_util.c
+++ b/src/broadcom/vulkan/v3dv_util.c
@@ -38,26 +38,6 @@
 #include "vk_enum_to_str.h"
 #include "v3dv_private.h"
 
-/** Log an error message.  */
-void v3dv_printflike(1, 2)
-   v3dv_loge(const char *format, ...)
-{
-   va_list va;
-
-   va_start(va, format);
-   v3dv_loge_v(format, va);
-   va_end(va);
-}
-
-/** \see v3dv_loge() */
-void
-v3dv_loge_v(const char *format, va_list va)
-{
-   fprintf(stderr, "vk: error: ");
-   vfprintf(stderr, format, va);
-   fprintf(stderr, "\n");
-}
-
 VkResult
 __vk_errorf(struct v3dv_instance *instance, VkResult error, const char *file,
             int line, const char *format, ...)



More information about the mesa-commit mailing list