radv: avoid GPU hangs if someone does a resolve with non-multisample src (v2)

[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..b892eb788519b52d9ee804bccf2743b68ffa8a12 100644 (file)
--- a/src/amd/vulkan/radv_util.c
+++ b/src/amd/vulkan/radv_util.c
@@ -29,6 +29,7 @@
 #include <assert.h>
 
 #include "radv_private.h"
+#include "vk_enum_to_str.h"
 
 #include "util/u_math.h"
 
@@ -65,55 +66,13 @@ void radv_printflike(3, 4)
        fprintf(stderr, "%s:%d: FINISHME: %s\n", file, line, buffer);
 }
 
-void radv_noreturn radv_printflike(1, 2)
-       radv_abortf(const char *format, ...)
-{
-       va_list va;
-
-       va_start(va, format);
-       radv_abortfv(format, va);
-       va_end(va);
-}
-
-void radv_noreturn
-radv_abortfv(const char *format, va_list va)
-{
-       fprintf(stderr, "vk: error: ");
-       vfprintf(stderr, format, va);
-       fprintf(stderr, "\n");
-       abort();
-}
-
 VkResult
 __vk_errorf(VkResult error, 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) {
-
-               /* 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)
-
-                       /* Extension errors */
-                       ERROR_CASE(VK_ERROR_OUT_OF_DATE_KHR)
-
-       default:
-               assert(!"Unknown error");
-               error_str = "unknown error";
-       }
-
-#undef ERROR_CASE
+       const char *error_str = vk_Result_to_str(error);
 
        if (format) {
                va_start(ap, format);