split fx macros

Shaders/Deferred/Shaders/Macros.fxh

@@ -13,14 +13,6 @@
 #ifdef SM4  // Macros for targetting HLSL 4.0
 
 
-#define BEGIN_CONSTANTS     cbuffer Parameters : register(b0) {
-#define MATRIX_CONSTANTS
-#define END_CONSTANTS       };
-
-#define _vs(r)
-#define _ps(r)
-#define _cb(r)
-
 #define DECLARE_TEXTURE(Name, index) \
     Texture2D<float4> Name : register(t##index); \
     sampler Name##Sampler : register(s##index)
@@ -36,14 +28,6 @@
 #else  // Macros for targetting shader model 2.0 (XNA & MojoShader)
 
 
-#define BEGIN_CONSTANTS
-#define MATRIX_CONSTANTS
-#define END_CONSTANTS
-
-#define _vs(r)  : register(vs, r)
-#define _ps(r)  : register(ps, r)
-#define _cb(r)
-
 #define DECLARE_TEXTURE(Name, index) \
     texture2D Name : register(t##index); \
     sampler Name##Sampler : register(s##index) 
@@ -56,4 +40,31 @@
 #define SAMPLE_CUBEMAP(Name, texCoord)  texCUBE(Name##Sampler, texCoord)
 
 
+#endif
+
+
+#ifdef SM4  // Macros for targetting HLSL 4.0
+
+
+#define BEGIN_CONSTANTS     cbuffer Parameters : register(b0) {
+#define MATRIX_CONSTANTS
+#define END_CONSTANTS       };
+
+#define _vs(r)
+#define _ps(r)
+#define _cb(r)
+
+
+#else  // Macros for targetting shader model 2.0 (XNA & MojoShader)
+
+
+#define BEGIN_CONSTANTS
+#define MATRIX_CONSTANTS
+#define END_CONSTANTS
+
+#define _vs(r)  : register(vs, r)
+#define _ps(r)  : register(ps, r)
+#define _cb(r)
+
+
 #endif

Shaders/FXAA/Shaders/Macros.fxh

@@ -13,14 +13,6 @@
 #ifdef SM4  // Macros for targetting HLSL 4.0
 
 
-#define BEGIN_CONSTANTS     cbuffer Parameters : register(b0) {
-#define MATRIX_CONSTANTS
-#define END_CONSTANTS       };
-
-#define _vs(r)
-#define _ps(r)
-#define _cb(r)
-
 #define DECLARE_TEXTURE(Name, index) \
     Texture2D<float4> Name : register(t##index); \
     sampler Name##Sampler : register(s##index)
@@ -36,14 +28,6 @@
 #else  // Macros for targetting shader model 2.0 (XNA & MojoShader)
 
 
-#define BEGIN_CONSTANTS
-#define MATRIX_CONSTANTS
-#define END_CONSTANTS
-
-#define _vs(r)  : register(vs, r)
-#define _ps(r)  : register(ps, r)
-#define _cb(r)
-
 #define DECLARE_TEXTURE(Name, index) \
     texture2D Name; \
     sampler Name##Sampler : register(s##index)= sampler_state { Texture = (Name); };
@@ -56,4 +40,31 @@
 #define SAMPLE_CUBEMAP(Name, texCoord)  texCUBE(Name##Sampler, texCoord)
 
 
+#endif
+
+
+#ifdef SM4  // Macros for targetting HLSL 4.0
+
+
+#define BEGIN_CONSTANTS     cbuffer Parameters : register(b0) {
+#define MATRIX_CONSTANTS
+#define END_CONSTANTS       };
+
+#define _vs(r)
+#define _ps(r)
+#define _cb(r)
+
+
+#else  // Macros for targetting shader model 2.0 (XNA & MojoShader)
+
+
+#define BEGIN_CONSTANTS
+#define MATRIX_CONSTANTS
+#define END_CONSTANTS
+
+#define _vs(r)  : register(vs, r)
+#define _ps(r)  : register(ps, r)
+#define _cb(r)
+
+
 #endif

Shaders/InfiniteGrid/Shaders/Macros.fxh

@@ -16,14 +16,6 @@
 #ifdef SM4  // Macros for targetting HLSL 4.0
 
 
-#define BEGIN_CONSTANTS     cbuffer Parameters : register(b0) {
-#define MATRIX_CONSTANTS
-#define END_CONSTANTS       };
-
-#define _vs(r)
-#define _ps(r)
-#define _cb(r)
-
 #define DECLARE_TEXTURE(Name, index) \
     Texture2D<float4> Name : register(t##index); \
     sampler Name##Sampler : register(s##index)
@@ -39,14 +31,6 @@
 #else  // Macros for targetting shader model 2.0 (XNA & MojoShader)
 
 
-#define BEGIN_CONSTANTS
-#define MATRIX_CONSTANTS
-#define END_CONSTANTS
-
-#define _vs(r)  : register(vs, r)
-#define _ps(r)  : register(ps, r)
-#define _cb(r)
-
 #define DECLARE_TEXTURE(Name, index) \
     texture2D Name : register(t##index); \
     sampler Name##Sampler : register(s##index) 
@@ -59,4 +43,31 @@
 #define SAMPLE_CUBEMAP(Name, texCoord)  texCUBE(Name##Sampler, texCoord)
 
 
+#endif
+
+
+#ifdef SM4  // Macros for targetting HLSL 4.0
+
+
+#define BEGIN_CONSTANTS     cbuffer Parameters : register(b0) {
+#define MATRIX_CONSTANTS
+#define END_CONSTANTS       };
+
+#define _vs(r)
+#define _ps(r)
+#define _cb(r)
+
+
+#else  // Macros for targetting shader model 2.0 (XNA & MojoShader)
+
+
+#define BEGIN_CONSTANTS
+#define MATRIX_CONSTANTS
+#define END_CONSTANTS
+
+#define _vs(r)  : register(vs, r)
+#define _ps(r)  : register(ps, r)
+#define _cb(r)
+
+
 #endif

Shaders/Tilemap/Shaders/Macros.fxh

@@ -12,14 +12,6 @@
 #ifdef SM4  // Macros for targetting HLSL 4.0
 
 
-#define BEGIN_CONSTANTS     cbuffer Parameters : register(b0) {
-#define MATRIX_CONSTANTS
-#define END_CONSTANTS       };
-
-#define _vs(r)
-#define _ps(r)
-#define _cb(r)
-
 #define DECLARE_TEXTURE(Name, index) \
     Texture2D<float4> Name : register(t##index); \
     sampler Name##Sampler : register(s##index)
@@ -35,14 +27,6 @@
 #else  // Macros for targetting shader model 2.0 (XNA & MojoShader)
 
 
-#define BEGIN_CONSTANTS
-#define MATRIX_CONSTANTS
-#define END_CONSTANTS
-
-#define _vs(r)  : register(vs, r)
-#define _ps(r)  : register(ps, r)
-#define _cb(r)
-
 #define DECLARE_TEXTURE(Name, index) \
     texture2D Name : register(t##index); \
     sampler Name##Sampler : register(s##index) 
@@ -55,4 +39,30 @@
 #define SAMPLE_CUBEMAP(Name, texCoord)  texCUBE(Name##Sampler, texCoord)
 
 
+#endif
+
+
+#ifdef SM4  // Macros for targetting HLSL 4.0
+
+#define BEGIN_CONSTANTS     cbuffer Parameters : register(b0) {
+#define MATRIX_CONSTANTS
+#define END_CONSTANTS       };
+
+#define _vs(r)
+#define _ps(r)
+#define _cb(r)
+
+
+#else  // Macros for targetting shader model 2.0 (XNA & MojoShader)
+
+
+#define BEGIN_CONSTANTS
+#define MATRIX_CONSTANTS
+#define END_CONSTANTS
+
+#define _vs(r)  : register(vs, r)
+#define _ps(r)  : register(ps, r)
+#define _cb(r)
+
+
 #endif