radv: destroy the base object if VkCreateFence() failed

[mesa.git] / src / amd / vulkan / radv_util.c

diff --git a/src/amd/vulkan/radv_util.c b/src/amd/vulkan/radv_util.c
index 8c7a948bc95225164beec6088e8775f1c631c4a6..72bedc687d4bd7b408d471f408c21305f546e082 100644 (file)
--- a/src/amd/vulkan/radv_util.c
+++ b/src/amd/vulkan/radv_util.c
@@ -29,6 +29,8 @@
 #include <assert.h>
 
 #include "radv_private.h"
+#include "radv_debug.h"
+#include "vk_enum_to_str.h"
 
 #include "util/u_math.h"
 
@@ -52,68 +54,52 @@ radv_loge_v(const char *format, va_list va)
        fprintf(stderr, "\n");
 }
 
-void radv_printflike(3, 4)
-       __radv_finishme(const char *file, int line, const char *format, ...)
-{
-       va_list ap;
-       char buffer[256];
-
-       va_start(ap, format);
-       vsnprintf(buffer, sizeof(buffer), format, ap);
-       va_end(ap);
-
-       fprintf(stderr, "%s:%d: FINISHME: %s\n", file, line, buffer);
-}
-
-void radv_noreturn radv_printflike(1, 2)
-       radv_abortf(const char *format, ...)
+/** Log an error message.  */
+void radv_printflike(1, 2)
+       radv_logi(const char *format, ...)
 {
        va_list va;
 
        va_start(va, format);
-       radv_abortfv(format, va);
+       radv_logi_v(format, va);
        va_end(va);
 }
 
-void radv_noreturn
-radv_abortfv(const char *format, va_list va)
+/** \see radv_logi() */
+void
+radv_logi_v(const char *format, va_list va)
 {
-       fprintf(stderr, "vk: error: ");
+       fprintf(stderr, "radv: info: ");
        vfprintf(stderr, format, va);
        fprintf(stderr, "\n");
-       abort();
 }
 
-VkResult
-__vk_errorf(VkResult error, const char *file, int line, const char *format, ...)
+void radv_printflike(3, 4)
+       __radv_finishme(const char *file, int line, const char *format, ...)
 {
        va_list ap;
        char buffer[256];
 
-#define ERROR_CASE(error) case error: error_str = #error; break;
-
-       const char *error_str;
-       switch ((int32_t)error) {
+       va_start(ap, format);
+       vsnprintf(buffer, sizeof(buffer), format, ap);
+       va_end(ap);
 
-               /* Core errors */
-               ERROR_CASE(VK_ERROR_OUT_OF_HOST_MEMORY)
-                       ERROR_CASE(VK_ERROR_OUT_OF_DEVICE_MEMORY)
-                       ERROR_CASE(VK_ERROR_INITIALIZATION_FAILED)
-                       ERROR_CASE(VK_ERROR_DEVICE_LOST)
-                       ERROR_CASE(VK_ERROR_MEMORY_MAP_FAILED)
-                       ERROR_CASE(VK_ERROR_LAYER_NOT_PRESENT)
-                       ERROR_CASE(VK_ERROR_EXTENSION_NOT_PRESENT)
-                       ERROR_CASE(VK_ERROR_INCOMPATIBLE_DRIVER)
+       fprintf(stderr, "%s:%d: FINISHME: %s\n", file, line, buffer);
+}
 
-                       /* Extension errors */
-                       ERROR_CASE(VK_ERROR_OUT_OF_DATE_KHR)
+VkResult
+__vk_errorf(struct radv_instance *instance, VkResult error, const char *file,
+           int line, const char *format, ...)
+{
+       va_list ap;
+       char buffer[256];
 
-       default:
-               assert(!"Unknown error");
-               error_str = "unknown error";
-       }
+       const char *error_str = vk_Result_to_str(error);
 
-#undef ERROR_CASE
+#ifndef DEBUG
+       if (instance && !(instance->debug_flags & RADV_DEBUG_ERRORS))
+               return error;
+#endif
 
        if (format) {
                va_start(ap, format);