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/src/TestShaderResArrays.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'Tests/TestApp/src/TestShaderResArrays.cpp')

diff --git a/Tests/TestApp/src/TestShaderResArrays.cpp b/Tests/TestApp/src/TestShaderResArrays.cpp
index d58b776..4144944 100644
--- a/Tests/TestApp/src/TestShaderResArrays.cpp
+++ b/Tests/TestApp/src/TestShaderResArrays.cpp
@@ -42,9 +42,11 @@ TestShaderResArrays::TestShaderResArrays(IRenderDevice *pDevice, IDeviceContext
     BasicShaderSourceStreamFactory BasicSSSFactory;
     CreationAttrs.pShaderSourceStreamFactory = &BasicSSSFactory;
     CreationAttrs.Desc.TargetProfile = SHADER_PROFILE_DX_5_0;
+    CreationAttrs.UseCombinedTextureSamplers = true;
 
     RefCntAutoPtr<Diligent::IShader> pVS, pPS;
     {
+        CreationAttrs.Desc.Name = "TestShaderResArrays: VS";
         CreationAttrs.FilePath = "Shaders\\ShaderResArrayTest.vsh";
         CreationAttrs.Desc.ShaderType =  SHADER_TYPE_VERTEX;
         CreationAttrs.SourceLanguage = SHADER_SOURCE_LANGUAGE_HLSL;
@@ -52,13 +54,14 @@ TestShaderResArrays::TestShaderResArrays(IRenderDevice *pDevice, IDeviceContext
     }
 
     {
+        CreationAttrs.Desc.Name = "TestShaderResArrays: PS";
         CreationAttrs.FilePath = "Shaders\\ShaderResArrayTest.psh";
         
         StaticSamplerDesc StaticSampler;
         StaticSampler.Desc.MinFilter = FILTER_TYPE_LINEAR;
         StaticSampler.Desc.MagFilter = FILTER_TYPE_LINEAR;
         StaticSampler.Desc.MipFilter = FILTER_TYPE_LINEAR;
-        StaticSampler.TextureName = "g_tex2DTest";
+        StaticSampler.SamplerOrTextureName = "g_tex2DTest";
         CreationAttrs.Desc.NumStaticSamplers = 1;
         CreationAttrs.Desc.StaticSamplers = &StaticSampler;
         CreationAttrs.Desc.ShaderType =  SHADER_TYPE_PIXEL;
-- 
cgit v1.2.3