summaryrefslogtreecommitdiffstats
path: root/Tests/TestApp/src/TestTexturing.cpp
diff options
context:
space:
mode:
authorEgor Yusov <egor.yusov@gmail.com>2018-10-18 15:52:52 +0000
committerEgor Yusov <egor.yusov@gmail.com>2018-10-18 15:52:52 +0000
commite5d030cb921f4b967485eaea9cff9e54ff24232a (patch)
tree4ce52d4a0d3bd91933fc4cb098b0247a9242f8e9 /Tests/TestApp/src/TestTexturing.cpp
parentUpdate README.md (diff)
downloadDiligentEngine-e5d030cb921f4b967485eaea9cff9e54ff24232a.tar.gz
DiligentEngine-e5d030cb921f4b967485eaea9cff9e54ff24232a.zip
Enabled seperate samplers
Diffstat (limited to 'Tests/TestApp/src/TestTexturing.cpp')
-rw-r--r--Tests/TestApp/src/TestTexturing.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/Tests/TestApp/src/TestTexturing.cpp b/Tests/TestApp/src/TestTexturing.cpp
index fdd79b8..ccbb0c6 100644
--- a/Tests/TestApp/src/TestTexturing.cpp
+++ b/Tests/TestApp/src/TestTexturing.cpp
@@ -170,6 +170,7 @@ void TestTexturing::Init( IRenderDevice *pDevice, IDeviceContext *pDeviceContext
BasicShaderSourceStreamFactory BasicSSSFactory;
CreationAttrs.pShaderSourceStreamFactory = &BasicSSSFactory;
CreationAttrs.Desc.TargetProfile = bUseGLSL ? SHADER_PROFILE_GL_4_2 : SHADER_PROFILE_DX_5_0;
+ CreationAttrs.UseCombinedTextureSamplers = true;
RefCntAutoPtr<Diligent::IShader> pVS, pPS;
{
@@ -196,7 +197,7 @@ void TestTexturing::Init( IRenderDevice *pDevice, IDeviceContext *pDeviceContext
StaticSampler.Desc.MinFilter = FilterType;
StaticSampler.Desc.MagFilter = FilterType;
StaticSampler.Desc.MipFilter = FilterType;
- StaticSampler.TextureName = "g_tex2DTest";
+ StaticSampler.SamplerOrTextureName = "g_tex2DTest";
CreationAttrs.Desc.NumStaticSamplers = 1;
CreationAttrs.Desc.StaticSamplers = &StaticSampler;
m_pRenderDevice->CreateShader( CreationAttrs, &pPS );