From 4bf2e00ba5b0cea11fe7c7b225a88ad4079974bb Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Tue, 1 Feb 2022 01:07:25 +0000
Subject: [PATCH] Switch custom prefixes from defines to static constants

---
 renderdoc/data/glsl/glsl_ubos_cpp.h      | 18 +++++++++---------
 renderdoc/data/hlsl/hlsl_custom_prefix.h |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/renderdoc/data/glsl/glsl_ubos_cpp.h b/renderdoc/data/glsl/glsl_ubos_cpp.h
index e70788ea5..94bae7c4e 100644
--- a/renderdoc/data/glsl/glsl_ubos_cpp.h
+++ b/renderdoc/data/glsl/glsl_ubos_cpp.h
@@ -66,8 +66,8 @@ struct RD_CustomShader_UBO_Type
 
 #if defined(VULKAN)
 
-#define HLSL_CUSTOM_PREFIX \
-  R"EOPREFIX(
+const char HLSL_CUSTOM_PREFIX[] =
+    R"EOPREFIX(
 
 #define RD_FLOAT_1D_ARRAY_BINDING t6
 #define RD_FLOAT_1D_BINDING t6 // all textures treated as arrays, add macro aliases
@@ -215,10 +215,10 @@ float2 RD_SelectedRange()
   return RD_CBuffer_Data.SelectedRange;
 }
 
-)EOPREFIX"
+)EOPREFIX";
 
-#define GLSL_CUSTOM_PREFIX \
-  R"EOPREFIX(
+const char GLSL_CUSTOM_PREFIX[] =
+    R"EOPREFIX(
 #define RD_FLOAT_1D_ARRAY_BINDING 6
 #define RD_FLOAT_1D_BINDING 6 // all textures treated as arrays, add macro aliases
 
@@ -365,12 +365,12 @@ vec2 RD_SelectedRange()
   return RD_CBuffer_Data.SelectedRange;
 }
 
-)EOPREFIX"
+)EOPREFIX";
 
 #elif defined(OPENGL)
 
-#define GLSL_CUSTOM_PREFIX \
-  R"EOPREFIX(
+const char GLSL_CUSTOM_PREFIX[] =
+    R"EOPREFIX(
 #define RD_FLOAT_1D_BINDING 1
 #define RD_FLOAT_2D_BINDING 2
 #define RD_FLOAT_3D_BINDING 3
@@ -505,7 +505,7 @@ vec2 RD_SelectedRange()
   return RD_CBuffer_Data.SelectedRange;
 }
 
-)EOPREFIX"
+)EOPREFIX";
 
 #else
 
diff --git a/renderdoc/data/hlsl/hlsl_custom_prefix.h b/renderdoc/data/hlsl/hlsl_custom_prefix.h
index 967ce82cb..b80aa977e 100644
--- a/renderdoc/data/hlsl/hlsl_custom_prefix.h
+++ b/renderdoc/data/hlsl/hlsl_custom_prefix.h
@@ -1,6 +1,6 @@
 
-#define HLSL_CUSTOM_PREFIX \
-  R"EOPREFIX(
+const char HLSL_CUSTOM_PREFIX[] =
+    R"EOPREFIX(
 #define RD_FLOAT_1D_ARRAY_BINDING t1
 #define RD_FLOAT_1D_BINDING t1 // all textures treated as arrays, add macro aliases
 
@@ -150,4 +150,4 @@ float2 RD_SelectedRange()
   return RD_CBuffer_Data.SelectedRange;
 }
 
-)EOPREFIX"
+)EOPREFIX";