From cfba7d8781b0897e0f5415e5fafca4268955bc06 Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Mon, 29 Oct 2018 19:50:11 -0700 Subject: Updated core (using glslang to compile HLSL directly to SPIRV) --- Tests/TestApp/src/ShaderConverterTest.cpp | 2 +- Tests/TestApp/src/TestShaderResourceLayout.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'Tests/TestApp/src') 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 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 pSamplers[4]; IDeviceObject *pSams[4]; -- cgit v1.2.3