From be42e9a6d16dbc903739b31aae5133223b23dac4 Mon Sep 17 00:00:00 2001
From: James Park <jpark37@lagfreegames.com>
Date: Thu, 26 Nov 2020 19:08:57 -0800
Subject: [PATCH] radv: Update radv_assert for MSVC

MSVC hates parentheses in radv_assert, so replace with do/while(0).

Also switch nonstandard DEBUG with standard NDEBUG, which Aco uses.

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7866>
---
 src/amd/vulkan/radv_private.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h
index 20e567875cb..855865c1c7a 100644
--- a/src/amd/vulkan/radv_private.h
+++ b/src/amd/vulkan/radv_private.h
@@ -234,13 +234,13 @@ void radv_logi_v(const char *format, va_list va);
 	} while (0)
 
 /* A non-fatal assert.  Useful for debugging. */
-#ifdef DEBUG
-#define radv_assert(x) ({						\
-			if (unlikely(!(x)))				\
-				fprintf(stderr, "%s:%d ASSERT: %s\n", __FILE__, __LINE__, #x); \
-		})
-#else
+#ifdef NDEBUG
 #define radv_assert(x) do {} while(0)
+#else
+#define radv_assert(x) do { \
+	if (unlikely(!(x))) \
+		fprintf(stderr, "%s:%d ASSERT: %s\n", __FILE__, __LINE__, #x); \
+} while (0)
 #endif
 
 #define stub_return(v)					\