Fix preprocessor error.

##__VA_ARGS__ causes an error with clang if it's not preceded by a comma. The ## is
wholly unnecessary in this case so it can just be removed.

Bug b/73656151

Change-Id: Icc8a67a91b270d0e9b006cae7a438cdefa412f87
Reviewed-on: https://swiftshader-review.googlesource.com/21208
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Corentin Wallez <cwallez@google.com>

diff --git a/src/Common/Debug.hpp b/src/Common/Debug.hpp
index 5033bc5..9758c3b 100644 (file)
--- a/src/Common/Debug.hpp
+++ b/src/Common/Debug.hpp
@@ -40,7 +40,7 @@ inline void trace() {}
 #if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)
        #define UNIMPLEMENTED(...) do { \
                sw::trace("\t! Unimplemented: %s(%d): ", __FUNCTION__, __LINE__); \
-               sw::trace(##__VA_ARGS__); \
+               sw::trace(__VA_ARGS__); \
                sw::trace("\n"); \
                ASSERT(false); \
        } while(0)

diff --git a/src/OpenGL/common/debug.h b/src/OpenGL/common/debug.h
index d44d8d7..f7bd972 100644 (file)
--- a/src/OpenGL/common/debug.h
+++ b/src/OpenGL/common/debug.h
@@ -72,7 +72,7 @@ inline void trace() {}
 #if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)
 #define UNIMPLEMENTED(...) do { \
        es::trace("\t! Unimplemented: %s(%d): ", __FUNCTION__, __LINE__); \
-       es::trace(##__VA_ARGS__); \
+       es::trace(__VA_ARGS__); \
        es::trace("\n"); \
        assert(false); \
        } while(0)

diff --git a/src/OpenGL/compiler/debug.h b/src/OpenGL/compiler/debug.h
index f9f92d5..ffeecaa 100644 (file)
--- a/src/OpenGL/compiler/debug.h
+++ b/src/OpenGL/compiler/debug.h
@@ -50,7 +50,7 @@ inline void Trace() {}
 #undef UNIMPLEMENTED
 #define UNIMPLEMENTED(...) do { \
        sh::Trace("Unimplemented invoked: %s(%d): ", __FUNCTION__, __LINE__); \
-       sh::Trace(##__VA_ARGS__); \
+       sh::Trace(__VA_ARGS__); \
        sh::Trace("\n"); \
        assert(false); \
 } while(0)

diff --git a/src/Vulkan/VkDebug.hpp b/src/Vulkan/VkDebug.hpp
index 4210ee5..eca0744 100644 (file)
--- a/src/Vulkan/VkDebug.hpp
+++ b/src/Vulkan/VkDebug.hpp
@@ -69,7 +69,7 @@ inline void trace() {}
 #if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)
 #define UNIMPLEMENTED(...) do { \
        vk::trace("\t! Unimplemented: %s(%d): ", __FUNCTION__, __LINE__); \
-       vk::trace(##__VA_ARGS__); \
+       vk::trace(__VA_ARGS__); \
        vk::trace("\n"); \
        assert(false); \
        } while(0)