Updated lua test in test app to use (0,0,0,1) as border color

3 files changed, 42 insertions, 42 deletions

diff --git a/DiligentCore b/DiligentCore
-Subproject d4853af6c2ea79251b65aff5fad3992c6c8818f
+Subproject c3a81922ba0ddf3da52d5e0297715383ee93c32
diff --git a/Tests/TestApp/assets/LuaTest.lua b/Tests/TestApp/assets/LuaTest.lua
index e9025b1..8a30f77 100644
--- a/Tests/TestApp/assets/LuaTest.lua
+++ b/Tests/TestApp/assets/LuaTest.lua
@@ -24,10 +24,10 @@ assert( TestGlobalSampler.MinLOD == 1.5 )
 assert( TestGlobalSampler.MaxLOD == 4 )
 assert( TestGlobalSampler.MaxAnisotropy == 2 )
 assert( TestGlobalSampler.ComparisonFunc == "COMPARISON_FUNC_LESS" )
-assert( TestGlobalSampler.BorderColor.r == 1.5 )
-assert( TestGlobalSampler.BorderColor.g == 2.25 )
-assert( TestGlobalSampler.BorderColor.b == 3.125 )
-assert( TestGlobalSampler.BorderColor.a == 4.0625 )
+assert( TestGlobalSampler.BorderColor.r == 0.0 )
+assert( TestGlobalSampler.BorderColor.g == 0.0 )
+assert( TestGlobalSampler.BorderColor.b == 0.0 )
+assert( TestGlobalSampler.BorderColor.a == 1.0 )
 
 assert( TestGlobalBuffer2UAV.ViewType == "BUFFER_VIEW_UNORDERED_ACCESS" )
 assert( TestGlobalBuffer2UAV.ByteOffset == 0 )
@@ -59,7 +59,7 @@ TestSampler = Sampler.Create{
     MaxLOD = 10,
     MaxAnisotropy = 6,
     ComparisonFunc = "COMPARISON_FUNC_GREATER_EQUAL",
-    BorderColor = {r = 0.5, g = 0.25, b=0.125, a=0.0625},
+    BorderColor = {r = 0.0, g = 0.0, b=0.0, a=1.0},
 }
 assert( TestSampler.Name == "Test Sampler" )
 assert( TestSampler.MinFilter == "FILTER_TYPE_POINT" ) 
@@ -73,10 +73,10 @@ assert( TestSampler.MinLOD == 0.5 )
 assert( TestSampler.MaxLOD == 10 )
 assert( TestSampler.MaxAnisotropy == 6 )
 assert( TestSampler.ComparisonFunc == "COMPARISON_FUNC_GREATER_EQUAL" )
-assert( TestSampler.BorderColor.r == 0.5 )
-assert( TestSampler.BorderColor.g == 0.25 )
-assert( TestSampler.BorderColor.b == 0.125 )
-assert( TestSampler.BorderColor.a == 0.0625 )
+assert( TestSampler.BorderColor.r == 0.0 )
+assert( TestSampler.BorderColor.g == 0.0 )
+assert( TestSampler.BorderColor.b == 0.0 )
+assert( TestSampler.BorderColor.a == 1.0 )
 
 
 
@@ -107,29 +107,29 @@ assert( TestSampler2.MinLOD == 0.5 )
 assert( TestSampler2.MaxLOD == 10 )
 assert( TestSampler2.MaxAnisotropy == 6 )
 assert( TestSampler2.ComparisonFunc == "COMPARISON_FUNC_GREATER_EQUAL" )
-assert( TestSampler2.BorderColor.r == 0.5 )
-assert( TestSampler2.BorderColor.g == 0.25 )
-assert( TestSampler2.BorderColor.b == 0.125 )
-assert( TestSampler2.BorderColor.a == 0.0625 )
+assert( TestSampler2.BorderColor.r == 0.0 )
+assert( TestSampler2.BorderColor.g == 0.0 )
+assert( TestSampler2.BorderColor.b == 0.0 )
+assert( TestSampler2.BorderColor.a == 1.0 )
 
 
 
 TestSampler3 = Sampler.Create{
     BorderColor = 
-		{r = TestSampler2.BorderColor.r * 2, 
-	     g = TestSampler2.BorderColor.g * 2,
-		 b = TestSampler2.BorderColor.b * 2,
-		 a = TestSampler2.BorderColor.a * 2
+		{r = TestSampler2.BorderColor.r, 
+	     g = TestSampler2.BorderColor.g,
+		 b = TestSampler2.BorderColor.b,
+		 a = TestSampler2.BorderColor.a
 		 }
 }
-assert( TestSampler3.BorderColor.r == 0.5 * 2 )
-assert( TestSampler3.BorderColor.g == 0.25 * 2 )
-assert( TestSampler3.BorderColor.b == 0.125 * 2 )
-assert( TestSampler3.BorderColor.a == 0.0625 * 2 )
+assert( TestSampler3.BorderColor.r == 0.0 )
+assert( TestSampler3.BorderColor.g == 0.0 )
+assert( TestSampler3.BorderColor.b == 0.0 )
+assert( TestSampler3.BorderColor.a == 1.0 )
 
 -- TestSampler3.MaxLOD = 0
 TestSampler3.BorderColor.a = 1
-assert( TestSampler3.BorderColor.a == 0.0625 * 2 )
+assert( TestSampler3.BorderColor.a ==1.0 )
 
 function Func1()
 	local TestSampler = Sampler.Create{
@@ -342,10 +342,10 @@ function TestSamplerArg(Sampler)
 	assert( Sampler.MaxLOD == 10 )
 	assert( Sampler.MaxAnisotropy == 6 )
 	assert( Sampler.ComparisonFunc == "COMPARISON_FUNC_GREATER_EQUAL" )
-	assert( Sampler.BorderColor.r == 0.5 )
-	assert( Sampler.BorderColor.g == 0.25 )
-	assert( Sampler.BorderColor.b == 0.125 )
-	assert( Sampler.BorderColor.a == 0.0625 )	
+	assert( Sampler.BorderColor.r == 0.0 )
+	assert( Sampler.BorderColor.g == 0.0 )
+	assert( Sampler.BorderColor.b == 0.0 )
+	assert( Sampler.BorderColor.a == 1.0 )	
 	Sampler = nil
 	collectgarbage()
 end
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<ISampler> 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<ISampler> 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 );
     }