Add EXPECT_REFCOUNT_EQ for D3D12 device at end of test.

Author: bbernhar

src/tests/D3D12Test.cpp

@@ -124,6 +124,10 @@ namespace gpgmm::d3d12 {
 
     void D3D12TestBase::TearDown() {
         GPGMMTestBase::TearDown();
+
+        // Check that nothing was leaked from the D3D12 device.
+        // If the test doesn't fully clean-up itself, this will trip.
+        EXPECT_REFCOUNT_EQ(mDevice.Get(), 1);
     }
 
     RESOURCE_ALLOCATOR_DESC D3D12TestBase::CreateBasicAllocatorDesc() const {

src/tests/end2end/D3D12ResidencyManagerTests.cpp

@@ -16,6 +16,7 @@
 
 #include "gpgmm/common/SizeClass.h"
 #include "gpgmm/d3d12/CapsD3D12.h"
+#include "gpgmm/d3d12/FenceD3D12.h"
 #include "gpgmm/d3d12/ResourceHeapAllocatorD3D12.h"
 #include "gpgmm/d3d12/UtilsD3D12.h"
 
@@ -907,9 +908,12 @@ TEST_F(D3D12ResidencyManagerTests, OverBudgetWithMappedResources) {
 // swaps the residency status using ExecuteCommandList: first set gets paged-in again, second set
 // gets paged-out.
 TEST_F(D3D12ResidencyManagerTests, OverBudgetExecuteCommandList) {
+    RESIDENCY_MANAGER_DESC residencyManagerDesc = CreateBasicResidencyDesc(kDefaultBudget);
+    residencyManagerDesc.InitialFenceValue = 0;
+
     ComPtr<IResidencyManager> residencyManager;
-    ASSERT_SUCCEEDED(CreateResidencyManager(CreateBasicResidencyDesc(kDefaultBudget), mDevice.Get(),
-                                            mAdapter.Get(), &residencyManager));
+    ASSERT_SUCCEEDED(CreateResidencyManager(residencyManagerDesc, mDevice.Get(), mAdapter.Get(),
+                                            &residencyManager));
 
     ComPtr<IResourceAllocator> resourceAllocator;
     ASSERT_SUCCEEDED(CreateResourceAllocator(CreateBasicAllocatorDesc(), mDevice.Get(),
@@ -969,13 +973,25 @@ TEST_F(D3D12ResidencyManagerTests, OverBudgetExecuteCommandList) {
     // Command list must be closed before calling ExecuteCommandLists.
     ASSERT_SUCCEEDED(commandList->Close());
 
+    std::unique_ptr<Fence> fence;
+    {
+        Fence* fencePtr = nullptr;
+        ASSERT_SUCCEEDED(
+            Fence::CreateFence(mDevice.Get(), residencyManagerDesc.InitialFenceValue, &fencePtr));
+        fence.reset(fencePtr);
+    }
+
+    ASSERT_SUCCEEDED(fence->Signal(queue.Get()));
+
     {
         IResidencyList* residencyLists[] = {firstSetOfHeapsWorkingSet.Get()};
         ID3D12CommandList* commandLists[] = {commandList.Get()};
         ASSERT_SUCCEEDED(
             residencyManager->ExecuteCommandLists(queue.Get(), commandLists, residencyLists, 1));
     }
 
+    ASSERT_SUCCEEDED(fence->WaitFor(fence->GetLastSignaledFence()));
+
     // Everything below the budget should now be resident.
     for (auto& allocation : firstSetOfHeaps) {
         EXPECT_EQ(allocation->GetMemory()->GetInfo().Status, RESIDENCY_HEAP_STATUS_RESIDENT);
@@ -994,13 +1010,17 @@ TEST_F(D3D12ResidencyManagerTests, OverBudgetExecuteCommandList) {
         secondSetOfHeapsWorkingSet->Add(allocation->GetMemory());
     }
 
+    ASSERT_SUCCEEDED(fence->Signal(queue.Get()));
+
     {
         IResidencyList* residencyLists[] = {secondSetOfHeapsWorkingSet.Get()};
         ID3D12CommandList* commandLists[] = {commandList.Get()};
         ASSERT_SUCCEEDED(
             residencyManager->ExecuteCommandLists(queue.Get(), commandLists, residencyLists, 1));
     }
 
+    ASSERT_SUCCEEDED(fence->WaitFor(fence->GetLastSignaledFence()));
+
     // Everything below the budget should now be evicted.
     for (auto& allocation : firstSetOfHeaps) {
         EXPECT_EQ(allocation->GetMemory()->GetInfo().Status, RESIDENCY_HEAP_STATUS_EVICTED);