fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-08 15:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

vulkan/log: Drop _impl from the log helper names

Browse source 
Now that we no longer have every driver in the tree defining their own
__vk_errorf and __vk_errorv, we don't need to worry about the symbol
collision anymore and can use the "real" names for the common ones.

Tested-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13045>
This commit is contained in:
Jason Ekstrand 2021-09-24 15:38:40 -05:00 • committed by Marge Bot
parent a1ac8234ec
commit ad27db2ae9
2 changed files with 15 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/vulkan/util/vk_log.c
View file

@ -274,9 +274,9 @@ vk_object_for_error(struct vk_object_base *obj, VkResult error)
}
VkResult
__vk_errorv_impl(const void *_obj, VkResult error,
const char *file, int line,
const char *format, va_list va)
__vk_errorv(const void *_obj, VkResult error,
const char *file, int line,
const char *format, va_list va)
{
struct vk_object_base *object = (struct vk_object_base *)_obj;
struct vk_instance *instance = vk_object_to_instance(object);
@ -324,14 +324,14 @@ __vk_errorv_impl(const void *_obj, VkResult error,
}
VkResult
__vk_errorf_impl(const void *_obj, VkResult error,
const char *file, int line,
const char *format, ...)
__vk_errorf(const void *_obj, VkResult error,
const char *file, int line,
const char *format, ...)
{
va_list va;
va_start(va, format);
VkResult result = __vk_errorv_impl(_obj, error, file, line, format, va);
VkResult result = __vk_errorv(_obj, error, file, line, format, va);
va_end(va);
return result;

24
src/vulkan/util/vk_log.h
View file

@ -73,25 +73,17 @@ __vk_log_impl(VkDebugUtilsMessageSeverityFlagBitsEXT severity,
...);
#define vk_error(obj, error) \
__vk_errorf_impl(obj, error, __FILE__, __LINE__, NULL)
__vk_errorf(obj, error, __FILE__, __LINE__, NULL)
#define vk_errorf(obj, error, ...) \
__vk_errorf_impl(obj, error, __FILE__, __LINE__, __VA_ARGS__)
/* For now, the function is named __vk_errorf_impl and we use a macro to
* re-name it for any drivers which include this header. This is to prevent
* linking errors while we do the rework. We'll drop it once everyone is
* using the common log function.
*/
#define __vk_errorf(...) __vk_errorf_impl(__VA_ARGS__)
#define __vk_errorv(...) __vk_errorv_impl(__VA_ARGS__)
__vk_errorf(obj, error, __FILE__, __LINE__, __VA_ARGS__)
VkResult
__vk_errorv_impl(const void *_obj, VkResult error,
const char *file, int line,
const char *format, va_list va);
__vk_errorv(const void *_obj, VkResult error,
const char *file, int line,
const char *format, va_list va);
VkResult PRINTFLIKE(5, 6)
__vk_errorf_impl(const void *_obj, VkResult error,
const char *file, int line,
const char *format, ...);
__vk_errorf(const void *_obj, VkResult error,
const char *file, int line,
const char *format, ...);