From e5d030cb921f4b967485eaea9cff9e54ff24232a Mon Sep 17 00:00:00 2001
From: Egor Yusov <egor.yusov@gmail.com>
Date: Thu, 18 Oct 2018 08:52:52 -0700
Subject: Enabled seperate samplers

---
 Tests/TestApp/assets/TestRenderTargets.lua | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'Tests/TestApp/assets/TestRenderTargets.lua')

diff --git a/Tests/TestApp/assets/TestRenderTargets.lua b/Tests/TestApp/assets/TestRenderTargets.lua
index 591c69a..fb539af 100644
--- a/Tests/TestApp/assets/TestRenderTargets.lua
+++ b/Tests/TestApp/assets/TestRenderTargets.lua
@@ -274,24 +274,27 @@ end
 
 QuadVS = Shader.Create{
 	FilePath =  GetShaderPath("RTTest\\QuadVS"),
+    UseCombinedTextureSamplers = true,
 	Desc = {ShaderType = "SHADER_TYPE_VERTEX"}
 }
 
 
 RenderToTexturesPS = Shader.Create{
 	FilePath =  GetShaderPath("RTTest\\RenderToTexturesPS"),
+    UseCombinedTextureSamplers = true,
 	Desc = {ShaderType = "SHADER_TYPE_PIXEL"}
 }
 
 BlendTexturesPS = Shader.Create{
 	FilePath =  GetShaderPath("RTTest\\BlendTexturesPS"),
+    UseCombinedTextureSamplers = true,
 	Desc = 
 	{
 		ShaderType = "SHADER_TYPE_PIXEL",
 		StaticSamplers = 
 		{
 			{
-				TextureName = "g_tex2DTest0",
+				SamplerOrTextureName = "g_tex2DTest0",
 				Desc = 
 				{
 					MinFilter = "FILTER_TYPE_LINEAR", 
@@ -301,7 +304,7 @@ BlendTexturesPS = Shader.Create{
 				}
 			},
 			{
-				TextureName = "g_tex2DTest2",
+				SamplerOrTextureName = "g_tex2DTest2",
 				Desc = 
 				{
 					MinFilter = "FILTER_TYPE_LINEAR", 
@@ -314,7 +317,7 @@ BlendTexturesPS = Shader.Create{
 	}
 }
 assert(BlendTexturesPS.Desc.StaticSamplers[1].Desc.MipFilter == "FILTER_TYPE_POINT");
-assert(BlendTexturesPS.Desc.StaticSamplers[2].TextureName == "g_tex2DTest2");
+assert(BlendTexturesPS.Desc.StaticSamplers[2].SamplerOrTextureName == "g_tex2DTest2");
 
 QuadVS:BindResources(ResMapping)
 RenderToTexturesPS:BindResources(ResMapping)
-- 
cgit v1.2.3