DECLARE_TEXTURE macro

Shaders/Deferred/Shaders/Macros.fxh

@@ -49,13 +49,15 @@
 #define _cb(r)
 
 #define DECLARE_TEXTURE(Name, index) \
-    sampler2D Name : register(s##index);
+    texture2D Name; \
+    sampler Name##Sampler : register(s##index)= sampler_state { Texture = (Name); };
 
 #define DECLARE_CUBEMAP(Name, index) \
-    samplerCUBE Name : register(s##index);
+    textureCUBE Name; \
+    sampler Name##Sampler : register(s##index) = sampler_state { Texture = (Name); };
 
-#define SAMPLE_TEXTURE(Name, texCoord)  tex2D(Name, texCoord)
-#define SAMPLE_CUBEMAP(Name, texCoord)  texCUBE(Name, texCoord)
+#define SAMPLE_TEXTURE(Name, texCoord)  tex2D(Name##Sampler, texCoord)
+#define SAMPLE_CUBEMAP(Name, texCoord)  texCUBE(Name##Sampler, texCoord)
 
 
 #endif

Shaders/FXAA/Shaders/FXAAGreenLumaHigh.fx

@@ -60,7 +60,7 @@ float4 PixelShaderFunction_FXAA(VSOutput input) : SV_Target0
 	tex.tex = Texture;
 	tex.smpl = TextureSampler;
 #else
-    tex = Texture;
+    tex = TextureSampler;
 #endif
 	
 	float4 value = FxaaPixelShader(

Shaders/FXAA/Shaders/FXAAGreenLumaLow.fx

@@ -59,7 +59,7 @@ float4 PixelShaderFunction_FXAA(VSOutput input) : SV_Target0
 	tex.tex = Texture;
 	tex.smpl = TextureSampler;
 #else
-    tex = Texture;
+    tex = TextureSampler;
 #endif
 	
 	float4 value = FxaaPixelShader(

Shaders/FXAA/Shaders/FXAAGreenLumaMedium.fx

@@ -60,7 +60,7 @@ float4 PixelShaderFunction_FXAA(VSOutput input) : SV_Target0
 	tex.tex = Texture;
 	tex.smpl = TextureSampler;
 #else
-    tex = Texture;
+    tex = TextureSampler;
 #endif
 	
 	float4 value = FxaaPixelShader(

Shaders/FXAA/Shaders/Macros.fxh

@@ -49,13 +49,15 @@
 #define _cb(r)
 
 #define DECLARE_TEXTURE(Name, index) \
-    sampler2D Name : register(s##index);
+    texture2D Name; \
+    sampler Name##Sampler : register(s##index)= sampler_state { Texture = (Name); };
 
 #define DECLARE_CUBEMAP(Name, index) \
-    samplerCUBE Name : register(s##index);
+    textureCUBE Name; \
+    sampler Name##Sampler : register(s##index) = sampler_state { Texture = (Name); };
 
-#define SAMPLE_TEXTURE(Name, texCoord)  tex2D(Name, texCoord)
-#define SAMPLE_CUBEMAP(Name, texCoord)  texCUBE(Name, texCoord)
+#define SAMPLE_TEXTURE(Name, texCoord)  tex2D(Name##Sampler, texCoord)
+#define SAMPLE_CUBEMAP(Name, texCoord)  texCUBE(Name##Sampler, texCoord)
 
 
 #endif

Shaders/InfiniteGrid/Shaders/Macros.fxh

@@ -55,13 +55,15 @@
 #define _cb(r)
 
 #define DECLARE_TEXTURE(Name, index) \
-    sampler2D Name : register(s##index);
+    texture2D Name; \
+    sampler Name##Sampler : register(s##index)= sampler_state { Texture = (Name); };
 
 #define DECLARE_CUBEMAP(Name, index) \
-    samplerCUBE Name : register(s##index);
+    textureCUBE Name; \
+    sampler Name##Sampler : register(s##index) = sampler_state { Texture = (Name); };
 
-#define SAMPLE_TEXTURE(Name, texCoord)  tex2D(Name, texCoord)
-#define SAMPLE_CUBEMAP(Name, texCoord)  texCUBE(Name, texCoord)
+#define SAMPLE_TEXTURE(Name, texCoord)  tex2D(Name##Sampler, texCoord)
+#define SAMPLE_CUBEMAP(Name, texCoord)  texCUBE(Name##Sampler, texCoord)
 
 
 #endif

Shaders/Tilemap/Shaders/Macros.fxh

@@ -50,10 +50,12 @@
 #define _cb(r)
 
 #define DECLARE_TEXTURE(Name, index) \
-    sampler2D Name##Sampler : register(s##index);
+    texture2D Name; \
+    sampler Name##Sampler : register(s##index)= sampler_state { Texture = (Name); };
 
 #define DECLARE_CUBEMAP(Name, index) \
-    samplerCUBE Name : register(s##index);
+    textureCUBE Name; \
+    sampler Name##Sampler : register(s##index) = sampler_state { Texture = (Name); };
 
 #define SAMPLE_TEXTURE(Name, texCoord)  tex2D(Name##Sampler, texCoord)
 #define SAMPLE_CUBEMAP(Name, texCoord)  texCUBE(Name##Sampler, texCoord)