intel/tools: Disassemble WAIT's argument as a destination

[mesa.git] / src / intel / vulkan / anv_util.c

diff --git a/src/intel/vulkan/anv_util.c b/src/intel/vulkan/anv_util.c
index 3c1803aa05668fd6e8f36cef8f98dc9ccde893e4..58d2efcc51f2d64b52ff650ff43a486c70c7c58a 100644 (file)
--- a/src/intel/vulkan/anv_util.c
+++ b/src/intel/vulkan/anv_util.c
@@ -30,7 +30,6 @@
 
 #include "anv_private.h"
 #include "vk_enum_to_str.h"
-#include "util/debug.h"
 
 /** Log an error message.  */
 void anv_printflike(1, 2)
@@ -51,13 +50,13 @@ anv_loge_v(const char *format, va_list va)
 }
 
 void anv_printflike(6, 7)
-__anv_perf_warn(struct anv_instance *instance, const void *object,
+__anv_perf_warn(struct anv_device *device, const void *object,
                 VkDebugReportObjectTypeEXT type,
                 const char *file, int line, const char *format, ...)
 {
    va_list ap;
    char buffer[256];
-   char report[256];
+   char report[512];
 
    va_start(ap, format);
    vsnprintf(buffer, sizeof(buffer), format, ap);
@@ -65,7 +64,7 @@ __anv_perf_warn(struct anv_instance *instance, const void *object,
 
    snprintf(report, sizeof(report), "%s: %s", file, buffer);
 
-   vk_debug_report(&instance->debug_report_callbacks,
+   vk_debug_report(&device->physical->instance->debug_report_callbacks,
                    VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT,
                    type,
                    (uint64_t) (uintptr_t) object,
@@ -78,20 +77,17 @@ __anv_perf_warn(struct anv_instance *instance, const void *object,
 }
 
 VkResult
-__vk_errorf(struct anv_instance *instance, const void *object,
-                     VkDebugReportObjectTypeEXT type, VkResult error,
-                     const char *file, int line, const char *format, ...)
+__vk_errorv(struct anv_instance *instance, const void *object,
+            VkDebugReportObjectTypeEXT type, VkResult error,
+            const char *file, int line, const char *format, va_list ap)
 {
-   va_list ap;
    char buffer[256];
-   char report[256];
+   char report[512];
 
    const char *error_str = vk_Result_to_str(error);
 
    if (format) {
-      va_start(ap, format);
       vsnprintf(buffer, sizeof(buffer), format, ap);
-      va_end(ap);
 
       snprintf(report, sizeof(report), "%s:%d: %s (%s)", file, line, buffer,
                error_str);
@@ -112,9 +108,19 @@ __vk_errorf(struct anv_instance *instance, const void *object,
 
    intel_loge("%s", report);
 
-   if (error == VK_ERROR_DEVICE_LOST &&
-       env_var_as_boolean("ANV_ABORT_ON_DEVICE_LOSS", false))
-      abort();
+   return error;
+}
+
+VkResult
+__vk_errorf(struct anv_instance *instance, const void *object,
+            VkDebugReportObjectTypeEXT type, 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);
+   va_end(ap);
 
    return error;
 }