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

anv: Use vk_object_base::type for debug_report

Browse Source 
This is way better than the giant macro thing we had before.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8676>
This commit is contained in:
Jason Ekstrand
2021-01-28 17:17:59 -06:00
committed by Marge Bot
parent bd1705a480
commit c41eaf0add
8 changed files with 53 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,9 +49,9 @@ anv_loge_v(const char *format, va_list va)
mesa_loge_v(format, va);
}
void anv_printflike(6, 7)
__anv_perf_warn(struct anv_device *device, const void *object,
VkDebugReportObjectTypeEXT type,
void
__anv_perf_warn(struct anv_device *device,
const struct vk_object_base *object,
const char *file, int line, const char *format, ...)
{
va_list ap;
@@ -64,21 +64,18 @@ __anv_perf_warn(struct anv_device *device, const void *object,
snprintf(report, sizeof(report), "%s: %s", file, buffer);
VkObjectType object_type = object ? object->type : VK_OBJECT_TYPE_UNKNOWN;
vk_debug_report(&device->physical->instance->vk.debug_report,
VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT,
type,
(uint64_t) (uintptr_t) object,
line,
0,
"anv",
report);
object_type, (uint64_t)(uintptr_t)object,
line, 0, "anv", report);
mesa_logw("%s:%d: PERF: %s", file, line, buffer);
}
VkResult
__vk_errorv(struct anv_instance *instance, const void *object,
VkDebugReportObjectTypeEXT type, VkResult error,
__vk_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];
@@ -96,14 +93,11 @@ __vk_errorv(struct anv_instance *instance, const void *object,
}
if (instance) {
VkObjectType object_type = object ? object->type : VK_OBJECT_TYPE_UNKNOWN;
vk_debug_report(&instance->vk.debug_report,
VK_DEBUG_REPORT_ERROR_BIT_EXT,
type,
(uint64_t) (uintptr_t) object,
line,
0,
"anv",
report);
object_type, (uint64_t)(uintptr_t)object,
line, 0, "anv", report);
}
mesa_loge("%s", report);
@@ -112,14 +106,14 @@ __vk_errorv(struct anv_instance *instance, const void *object,
}
VkResult
__vk_errorf(struct anv_instance *instance, const void *object,
VkDebugReportObjectTypeEXT type, VkResult error,
__vk_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);
__vk_errorv(instance, object, type, error, file, line, format, ap);
__vk_errorv(instance, object, error, file, line, format, ap);
va_end(ap);
return error;