OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

anv: Use the common vk_error and vk_errorf helpers

Browse Source 
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13045>
This commit is contained in:
Jason Ekstrand
2021-09-24 12:06:32 -05:00
committed by Marge Bot
parent f6d52768d6
commit 88a8b937b5
28 changed files with 255 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/intel/vulkan/anv_util.c
View File

@@ -38,62 +38,22 @@ __anv_perf_warn(struct anv_device *device,
{
va_list ap;
char buffer[256];
char report[512];
va_start(ap, format);
vsnprintf(buffer, sizeof(buffer), format, ap);
va_end(ap);
snprintf(report, sizeof(report), "%s: %s", file, buffer);
vk_debug_report(&device->physical->instance->vk,
VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT,
object, line, 0, "anv", report);
mesa_logw("%s:%d: PERF: %s", file, line, buffer);
}
VkResult
__anv_errorv(struct anv_instance *instance,
const struct vk_object_base *object, VkResult error,
const char *file, int line, const char *format, va_list ap)
{
char buffer[256];
char report[512];
const char *error_str = vk_Result_to_str(error);
if (format) {
vsnprintf(buffer, sizeof(buffer), format, ap);
snprintf(report, sizeof(report), "%s:%d: %s (%s)", file, line, buffer,
error_str);
if (object) {
__vk_log(VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT,
VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT,
VK_LOG_OBJS(object), file, line,
"PERF: %s", buffer);
} else {
snprintf(report, sizeof(report), "%s:%d: %s", file, line, error_str);
__vk_log(VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT,
VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT,
VK_LOG_NO_OBJS(device->physical->instance), file, line,
"PERF: %s", buffer);
}
if (instance) {
vk_debug_report(&instance->vk, VK_DEBUG_REPORT_ERROR_BIT_EXT,
object, line, 0, "anv", report);
}
mesa_loge("%s", report);
return error;
}
VkResult
__anv_errorf(struct anv_instance *instance,
const struct vk_object_base *object, VkResult error,
const char *file, int line, const char *format, ...)
{
va_list ap;
va_start(ap, format);
__anv_errorv(instance, object, error, file, line, format, ap);
va_end(ap);
return error;
}
void