Switch custom prefixes from defines to static constants

This commit is contained in:
baldurk
2022-02-01 01:07:25 +00:00
parent f40e1fe951
commit 4bf2e00ba5
2 changed files with 12 additions and 12 deletions
+9 -9
View File
@@ -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
+3 -3
View File
@@ -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";