From e5d030cb921f4b967485eaea9cff9e54ff24232a Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Thu, 18 Oct 2018 08:52:52 -0700 Subject: Enabled seperate samplers --- Tests/TestApp/src/TestTexturing.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Tests/TestApp/src/TestTexturing.cpp') 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 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 ); -- cgit v1.2.3