diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2018-10-30 02:50:11 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2018-10-30 02:50:11 +0000 |
| commit | cfba7d8781b0897e0f5415e5fafca4268955bc06 (patch) | |
| tree | bb25e2a3ded639f9d35d8ee8f5bb2cca6668cb09 /Tests/TestApp/src | |
| parent | Updated core (fixed CMake bug introduced by glslang) (diff) | |
| download | DiligentEngine-cfba7d8781b0897e0f5415e5fafca4268955bc06.tar.gz DiligentEngine-cfba7d8781b0897e0f5415e5fafca4268955bc06.zip | |
Updated core (using glslang to compile HLSL directly to SPIRV)
Diffstat (limited to 'Tests/TestApp/src')
| -rw-r--r-- | Tests/TestApp/src/ShaderConverterTest.cpp | 2 | ||||
| -rw-r--r-- | Tests/TestApp/src/TestShaderResourceLayout.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Tests/TestApp/src/ShaderConverterTest.cpp b/Tests/TestApp/src/ShaderConverterTest.cpp index 51ee397..8fbe0b4 100644 --- a/Tests/TestApp/src/ShaderConverterTest.cpp +++ b/Tests/TestApp/src/ShaderConverterTest.cpp @@ -44,7 +44,7 @@ ShaderConverterTest::ShaderConverterTest( IRenderDevice *pRenderDevice, IDeviceC CreationAttrs.pShaderSourceStreamFactory = &BasicSSSFactory; CreationAttrs.SourceLanguage = SHADER_SOURCE_LANGUAGE_HLSL; CreationAttrs.Desc.Name = "Test converted shader"; - CreationAttrs.UseCombinedTextureSamplers = true; + CreationAttrs.UseCombinedTextureSamplers = pRenderDevice->GetDeviceCaps().IsGLDevice(); RefCntAutoPtr<IHLSL2GLSLConversionStream> pStream; CreationAttrs.ppConversionStream = pStream.GetRawDblPtr(); diff --git a/Tests/TestApp/src/TestShaderResourceLayout.cpp b/Tests/TestApp/src/TestShaderResourceLayout.cpp index 8bb4d3b..37f958a 100644 --- a/Tests/TestApp/src/TestShaderResourceLayout.cpp +++ b/Tests/TestApp/src/TestShaderResourceLayout.cpp @@ -43,7 +43,7 @@ TestShaderResourceLayout::TestShaderResourceLayout( IRenderDevice *pDevice, IDev BasicShaderSourceStreamFactory BasicSSSFactory("Shaders"); CreationAttrs.pShaderSourceStreamFactory = &BasicSSSFactory; CreationAttrs.EntryPoint = "main"; - CreationAttrs.UseCombinedTextureSamplers = true; + CreationAttrs.UseCombinedTextureSamplers = false; RefCntAutoPtr<ISampler> pSamplers[4]; IDeviceObject *pSams[4]; |