Updated submodules (main change: refactored release queues in D3D12 and Vulkan backends)

4 files changed, 175 insertions, 4 deletions

diff --git a/Tests/TestApp/src/ResourceReleaseQueueTest.cpp b/Tests/TestApp/src/ResourceReleaseQueueTest.cpp
new file mode 100644
index 0000000..1c76164
--- /dev/null
+++ b/Tests/TestApp/src/ResourceReleaseQueueTest.cpp
@@ -0,0 +1,129 @@
+/*     Copyright 2015-2018 Egor Yusov
+ *  
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
+ *
+ *  In no event and under no legal theory, whether in tort (including negligence), 
+ *  contract, or otherwise, unless required by applicable law (such as deliberate 
+ *  and grossly negligent acts) or agreed to in writing, shall any Contributor be
+ *  liable for any damages, including any direct, indirect, special, incidental, 
+ *  or consequential damages of any character arising as a result of this License or 
+ *  out of the use or inability to use the software (including but not limited to damages 
+ *  for loss of goodwill, work stoppage, computer failure or malfunction, or any and 
+ *  all other commercial damages or losses), even if such Contributor has been advised 
+ *  of the possibility of such damages.
+ */
+
+// EngineSandbox.cpp : Defines the entry point for the application.
+//
+
+#include "pch.h"
+#include "Errors.h"
+#include "ResourceReleaseQueue.h"
+#include "DefaultRawMemoryAllocator.h"
+#include "UnitTestBase.h"
+#include <memory>
+
+using namespace Diligent;
+
+class ResourceReleaseQueueTest : public UnitTestBase 
+{
+public:
+    ResourceReleaseQueueTest() : 
+        UnitTestBase("Resource release queue test")
+    {
+        struct ResourceA
+        {
+            int Data = 1;
+        };
+        struct ResourceB
+        {
+            float Data = 2;
+        };
+        struct ResourceC
+        {
+            float Data[2] = {3, 4};
+        };
+
+        {
+            ResourceReleaseQueue<DynamicStaleResourceWrapper> Queue(DefaultRawMemoryAllocator::GetAllocator());
+            std::unique_ptr<ResourceA> res0(new ResourceA);
+            std::unique_ptr<ResourceB> res1(new ResourceB);
+
+            Queue.SafeReleaseResource(std::move(res0), 0);
+            Queue.SafeReleaseResource(std::move(res1), 0);
+
+            std::unique_ptr<ResourceC> res2(new ResourceC);
+            auto Wrapper2 = Queue.CreateWrapper(std::move(res2), 1);    
+            //auto WrapperX = Queue.CreateWrapper(res2, 1);// - error
+            //auto WrapperY = Queue.CreateWrapper(static_cast<std::unique_ptr<ResourceC>&>(res2), 1);// - error
+            Queue.SafeReleaseResource(std::move(Wrapper2), 0);
+            
+            Queue.DiscardStaleResources(0, 1);
+
+            std::unique_ptr<ResourceA> res4(new ResourceA);
+            Queue.DiscardResource(std::move(res4), 1);
+
+            std::unique_ptr<ResourceB> res5(new ResourceB);
+            auto Wrapper5 = Queue.CreateWrapper(std::move(res5), 1);
+            Queue.DiscardResource(std::move(Wrapper5), 1);
+
+            Queue.Purge(1);
+        }
+
+        {
+            ResourceReleaseQueue<DynamicStaleResourceWrapper> Queue0(DefaultRawMemoryAllocator::GetAllocator());
+            ResourceReleaseQueue<DynamicStaleResourceWrapper> Queue1(DefaultRawMemoryAllocator::GetAllocator());
+            ResourceReleaseQueue<DynamicStaleResourceWrapper> Queue2(DefaultRawMemoryAllocator::GetAllocator());
+
+            std::unique_ptr<ResourceA> res0(new ResourceA);
+            std::unique_ptr<ResourceB> res1(new ResourceB);
+            std::unique_ptr<ResourceC> res2(new ResourceC);
+
+            auto Wrapper0 = ResourceReleaseQueue<DynamicStaleResourceWrapper>::CreateWrapper(std::move(res0), 3);
+            auto Wrapper1 = ResourceReleaseQueue<DynamicStaleResourceWrapper>::CreateWrapper(std::move(res1), 3);
+            auto Wrapper2 = ResourceReleaseQueue<DynamicStaleResourceWrapper>::CreateWrapper(std::move(res2), 1);
+
+            Queue0.SafeReleaseResource(Wrapper0, 0);
+            Queue0.SafeReleaseResource(Wrapper1, 0);
+            Queue0.SafeReleaseResource(Wrapper2, 0);
+            Wrapper2.GiveUpOwnership();
+
+            Queue1.SafeReleaseResource(Wrapper0, 0);
+            Queue1.SafeReleaseResource(Wrapper1, 0);
+
+            Queue2.SafeReleaseResource(std::move(Wrapper0), 0);
+            Queue2.SafeReleaseResource(Wrapper1, 0);
+            Wrapper1.GiveUpOwnership();
+            
+            Queue0.DiscardStaleResources(0, 1);
+            Queue1.DiscardStaleResources(0, 1);
+            Queue2.DiscardStaleResources(0, 1);
+
+            std::unique_ptr<ResourceC> res3(new ResourceC);
+            auto Wrapper3 = ResourceReleaseQueue<DynamicStaleResourceWrapper>::CreateWrapper(std::move(res3), 2);
+            Queue0.DiscardResource(Wrapper3, 1);
+            Queue1.DiscardResource(std::move(Wrapper3), 1);
+
+            std::unique_ptr<ResourceA> res4(new ResourceA);
+            auto Wrapper4 = ResourceReleaseQueue<DynamicStaleResourceWrapper>::CreateWrapper(std::move(res4), 1);
+            Queue2.DiscardResource(Wrapper4, 1);
+            Wrapper4.GiveUpOwnership();
+
+            Queue0.Purge(1);
+            Queue1.Purge(1);
+            Queue2.Purge(1);
+        }
+
+        SetStatus(TestResult::Succeeded);
+    }
+};
+
+static ResourceReleaseQueueTest TheTest;
\ No newline at end of file
diff --git a/Tests/TestApp/src/TestApp.cpp b/Tests/TestApp/src/TestApp.cpp
index 784fca1..e5bcefb 100644
--- a/Tests/TestApp/src/TestApp.cpp
+++ b/Tests/TestApp/src/TestApp.cpp
@@ -72,11 +72,44 @@ using namespace Diligent;
 TestApp::TestApp() :
     m_AppTitle("Test app")
 {
+    VERIFY_EXPR(PlatformMisc::GetMSB(Uint32{0}) == 32);
     for (Uint32 i = 0; i < 32; ++i)
     {
-        auto MSB = PlatformMisc::GetMSB((1 << i) | 1);
+        auto MSB = PlatformMisc::GetMSB((Uint32{1} << i) | 1);
         VERIFY_EXPR(MSB == i);
     }
+    
+    VERIFY_EXPR(PlatformMisc::GetMSB(Uint64{0}) == 64);
+    for (Uint32 i = 0; i < 64; ++i)
+    {
+        auto MSB = PlatformMisc::GetMSB((Uint64{1} << i) | 1);
+        VERIFY_EXPR(MSB == i);
+    }
+    
+    VERIFY_EXPR(PlatformMisc::GetLSB(Uint32{0}) == 32);
+    for (Uint32 i = 0; i < 32; ++i)
+    {
+        auto LSB = PlatformMisc::GetLSB((Uint32{1} << i) | (Uint32{1}<<31));
+        VERIFY_EXPR(LSB == i);
+    }
+
+    VERIFY_EXPR(PlatformMisc::GetLSB(Uint64{0}) == 64);
+    for (Uint32 i = 0; i < 64; ++i)
+    {
+        auto LSB = PlatformMisc::GetLSB((Uint64{1} << i) | (Uint64{1}<<63));
+        VERIFY_EXPR(LSB == i);
+    }
+
+    VERIFY_EXPR(PlatformMisc::CountOneBits(Uint32{0}) == 0);
+    VERIFY_EXPR(PlatformMisc::CountOneBits(Uint64{0}) == 0);
+    VERIFY_EXPR(PlatformMisc::CountOneBits(Uint32{1}) == 1);
+    VERIFY_EXPR(PlatformMisc::CountOneBits(Uint64{1}) == 1);
+    VERIFY_EXPR(PlatformMisc::CountOneBits(Uint32{7}) == 3);
+    VERIFY_EXPR(PlatformMisc::CountOneBits(Uint64{7}) == 3);
+    VERIFY_EXPR(PlatformMisc::CountOneBits( (Uint32{1}<<31) | (Uint32{1} << 15)) == 2);
+    VERIFY_EXPR(PlatformMisc::CountOneBits( (Uint64{1}<<63) | (Uint32{1} << 31)) == 2);
+    VERIFY_EXPR(PlatformMisc::CountOneBits( (Uint32{1}<<31) - 1) == 31);
+    VERIFY_EXPR(PlatformMisc::CountOneBits( (Uint64{1}<<63) - 1) == 63);
 }
 
 TestApp::~TestApp()
@@ -160,6 +193,12 @@ void TestApp::InitializeDiligentEngine(
             }
 
             EngineD3D12Attribs EngD3D12Attribs;
+            EngD3D12Attribs.CPUDescriptorHeapAllocationSize[0] = 64; // D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV
+            EngD3D12Attribs.CPUDescriptorHeapAllocationSize[1] = 32; // D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER
+            EngD3D12Attribs.CPUDescriptorHeapAllocationSize[2] = 16; // D3D12_DESCRIPTOR_HEAP_TYPE_RTV
+            EngD3D12Attribs.CPUDescriptorHeapAllocationSize[3] = 16; // D3D12_DESCRIPTOR_HEAP_TYPE_DSV
+            EngD3D12Attribs.DynamicDescriptorAllocationChunkSize[0] = 8; // D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV
+            EngD3D12Attribs.DynamicDescriptorAllocationChunkSize[1] = 8; // D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER
             ppContexts.resize(1 + NumDeferredCtx);
             
             pFactoryD3D12->CreateDeviceAndContextsD3D12(EngD3D12Attribs, &m_pDevice, ppContexts.data(), NumDeferredCtx);
@@ -272,6 +311,8 @@ void TestApp::InitializeDiligentEngine(
 
 void TestApp::InitializeRenderers()
 {
+    m_pMTResCreationTest.reset(new MTResourceCreationTest(m_pDevice, m_pImmediateContext, 7));
+    
     TestRasterizerState TestRS{m_pDevice, m_pImmediateContext};
     TestBlendState TestBS{m_pDevice, m_pImmediateContext};
     TestDepthStencilState TestDSS{m_pDevice, m_pImmediateContext};
@@ -283,8 +324,7 @@ void TestApp::InitializeRenderers()
     m_TestGS.Init(m_pDevice, m_pImmediateContext, m_pSwapChain);
     m_TestTessellation.Init(m_pDevice, m_pImmediateContext, m_pSwapChain);
     m_pTestShaderResArrays.reset(new TestShaderResArrays(m_pDevice, m_pImmediateContext, m_pSwapChain, 0.4f, -0.9f, 0.5f, 0.5f));
-    m_pMTResCreationTest.reset(new MTResourceCreationTest(m_pDevice, m_pImmediateContext, 7));
-    
+        
     TestShaderVarAccess TestShaderVarAccess{m_pDevice, m_pImmediateContext, m_pSwapChain};
     TestShaderResourceLayout TestShaderResLayout{m_pDevice, m_pImmediateContext};
     
diff --git a/Tests/TestApp/src/TestTextureCreation.cpp b/Tests/TestApp/src/TestTextureCreation.cpp
index 70936a5..1bade31 100644
--- a/Tests/TestApp/src/TestTextureCreation.cpp
+++ b/Tests/TestApp/src/TestTextureCreation.cpp
@@ -379,6 +379,8 @@ private:
         m_pDeviceContext->Flush();
         // Also call FinishFrame() because otherwise resources will not be released
         m_pDeviceContext->FinishFrame();
+
+        m_pDevice->ReleaseStaleResources();
     }
     
 
diff --git a/Tests/TestApp/src/VarSizeAllocationsManagerTest.cpp b/Tests/TestApp/src/VarSizeAllocationsManagerTest.cpp
index 791efe3..1e96239 100644
--- a/Tests/TestApp/src/VarSizeAllocationsManagerTest.cpp
+++ b/Tests/TestApp/src/VarSizeAllocationsManagerTest.cpp
@@ -63,7 +63,7 @@ VariableSizeAllocationsManagerTest::VariableSizeAllocationsManagerTest() :
         VERIFY_EXPR(a4.UnalignedOffset == 56 && a4.Size == 16);
 
         auto a5 = ListMgr.Allocate(64, 1);
-        VERIFY_EXPR(a5.UnalignedOffset == VariableSizeAllocationsManager::InvalidOffset && a5.Size == 0);
+        VERIFY_EXPR(!a5.IsValid() && a5.Size == 0);
 
         a5 = ListMgr.Allocate(16, 1);
         VERIFY_EXPR(a5.UnalignedOffset == 72 && a5.Size == 16);