From 1b5608a40c2307dbbb88588f2686f84f0274d8ea Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Fri, 1 Jun 2018 09:09:51 -0700 Subject: Updated lua test in test app to use (0,0,0,1) as border color --- Tests/TestApp/src/RenderScriptTest.cpp | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'Tests/TestApp/src/RenderScriptTest.cpp') diff --git a/Tests/TestApp/src/RenderScriptTest.cpp b/Tests/TestApp/src/RenderScriptTest.cpp index 1931480..b3ad3d5 100644 --- a/Tests/TestApp/src/RenderScriptTest.cpp +++ b/Tests/TestApp/src/RenderScriptTest.cpp @@ -107,10 +107,10 @@ RenderScriptTest::RenderScriptTest( IRenderDevice *pRenderDevice, IDeviceContext SamplerDesc.MaxLOD = 4; SamplerDesc.MaxAnisotropy = 2; SamplerDesc.ComparisonFunc = COMPARISON_FUNC_LESS; - SamplerDesc.BorderColor[0] = 1.5f; - SamplerDesc.BorderColor[1] = 2.25f; - SamplerDesc.BorderColor[2] = 3.125f; - SamplerDesc.BorderColor[3] = 4.0625f; + SamplerDesc.BorderColor[0] = 0.f; + SamplerDesc.BorderColor[1] = 0.f; + SamplerDesc.BorderColor[2] = 0.f; + SamplerDesc.BorderColor[3] = 1.f; RefCntAutoPtr pSampler; pRenderDevice->CreateSampler( SamplerDesc, &pSampler ); pScriptParser->SetGlobalVariable( "TestGlobalSampler", pSampler ); @@ -175,20 +175,20 @@ RenderScriptTest::RenderScriptTest( IRenderDevice *pRenderDevice, IDeviceContext assert( SamplerDesc.MaxLOD == 10 ); assert( SamplerDesc.MaxAnisotropy == 6 ); assert( SamplerDesc.ComparisonFunc == COMPARISON_FUNC_GREATER_EQUAL ); - assert( SamplerDesc.BorderColor[0] == 0.5f ); - assert( SamplerDesc.BorderColor[1] == 0.25f ); - assert( SamplerDesc.BorderColor[2] == 0.125f ); - assert( SamplerDesc.BorderColor[3] == 0.0625f ); + assert( SamplerDesc.BorderColor[0] == 0.f ); + assert( SamplerDesc.BorderColor[1] == 0.f ); + assert( SamplerDesc.BorderColor[2] == 0.f ); + assert( SamplerDesc.BorderColor[3] == 1.f ); } { RefCntAutoPtr pTestSampler3; pScript->GetSamplerByName( "TestSampler3", &pTestSampler3 ); const auto &SamplerDesc = pTestSampler3->GetDesc(); - assert( SamplerDesc.BorderColor[0] == 0.5f * 2.f); - assert( SamplerDesc.BorderColor[1] == 0.25f * 2.f ); - assert( SamplerDesc.BorderColor[2] == 0.125f * 2.f ); - assert( SamplerDesc.BorderColor[3] == 0.0625f * 2.f ); + assert( SamplerDesc.BorderColor[0] == 0.f); + assert( SamplerDesc.BorderColor[1] == 0.f ); + assert( SamplerDesc.BorderColor[2] == 0.f ); + assert( SamplerDesc.BorderColor[3] == 1.f ); } { @@ -207,10 +207,10 @@ RenderScriptTest::RenderScriptTest( IRenderDevice *pRenderDevice, IDeviceContext assert( SamplerDesc.MaxLOD == 10 ); assert( SamplerDesc.MaxAnisotropy == 6 ); assert( SamplerDesc.ComparisonFunc == COMPARISON_FUNC_GREATER_EQUAL ); - assert( SamplerDesc.BorderColor[0] == 0.5f ); - assert( SamplerDesc.BorderColor[1] == 0.25f ); - assert( SamplerDesc.BorderColor[2] == 0.125f ); - assert( SamplerDesc.BorderColor[3] == 0.0625f ); + assert( SamplerDesc.BorderColor[0] == 0.f ); + assert( SamplerDesc.BorderColor[1] == 0.f ); + assert( SamplerDesc.BorderColor[2] == 0.f ); + assert( SamplerDesc.BorderColor[3] == 1.f ); } -- cgit v1.2.3