Browse Source

Allow macro expansion for sampler registers with HLSL 4 and below

Pablo Escobar 5 years ago
parent
commit
77cd6482e7
1 changed files with 3 additions and 1 deletions
  1. 3 1
      src/bgfx_shader.sh

+ 3 - 1
src/bgfx_shader.sh

@@ -50,11 +50,13 @@
 #	define bvec3 bool3
 #	define bvec4 bool4
 
+#	define CONCAT_(_a, _b) _a ## _b
+#	define CONCAT(_a, _b) CONCAT_(_a, _b)
 
 #	if BGFX_SHADER_LANGUAGE_HLSL > 4
 #		define REGISTER(_type, _reg) register(_type[_reg])
 #	else
-#		define REGISTER(_type, _reg) register(_type ## _reg)
+#		define REGISTER(_type, _reg) register(CONCAT(CONCAT(_type, 0), _reg))
 #	endif // BGFX_SHADER_LANGUAGE_HLSL
 
 #	if BGFX_SHADER_LANGUAGE_HLSL > 3 || BGFX_SHADER_LANGUAGE_PSSL || BGFX_SHADER_LANGUAGE_SPIRV || BGFX_SHADER_LANGUAGE_METAL