diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2018-10-18 15:52:52 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2018-10-18 15:52:52 +0000 |
| commit | e5d030cb921f4b967485eaea9cff9e54ff24232a (patch) | |
| tree | 4ce52d4a0d3bd91933fc4cb098b0247a9242f8e9 /Tests/TestApp/src/TestShaderResArrays.cpp | |
| parent | Update README.md (diff) | |
| download | DiligentEngine-e5d030cb921f4b967485eaea9cff9e54ff24232a.tar.gz DiligentEngine-e5d030cb921f4b967485eaea9cff9e54ff24232a.zip | |
Enabled seperate samplers
Diffstat (limited to 'Tests/TestApp/src/TestShaderResArrays.cpp')
| -rw-r--r-- | Tests/TestApp/src/TestShaderResArrays.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
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; |