D3dx12residency fixes for errors with debug layer enabled. (#930)

dmeen-rare · web-flow · commit fc2e4767ff1c · 2025-10-29T10:41:58.000-04:00
These changes reset the evict count after the call to evict in ProcessPagingWork, it ports #785 into the other forks of the residency library file, and also removes the D3D12 WARNING: ID3D12CommandQueue1::Wait: Fence values can never be less than zero, so waiting for a fence value of zero will always be satisfied [ EXECUTION WARNING #1424: FENCE_ZERO_WAIT] messages.
diff --git a/Libraries/D3DX12Residency/d3dx12Residency.h b/Libraries/D3DX12Residency/d3dx12Residency.h
@@ -406,9 +406,16 @@ namespace D3DX12Residency
 
             HRESULT GPUWait(ID3D12CommandQueue* pQueue)
             {
-                HRESULT hr = pQueue->Wait(pFence, FenceValue);
-                RESIDENCY_CHECK_RESULT(hr);
-                return hr;
+                if (FenceValue > 0)
+                {
+                    HRESULT hr = pQueue->Wait(pFence, FenceValue);
+                    RESIDENCY_CHECK_RESULT(hr);
+                    return hr;
+                }
+                else
+                {
+                    return S_OK;
+                }
             }
 
             HRESULT GPUSignal(ID3D12CommandQueue* pQueue)
@@ -1332,6 +1339,7 @@ namespace D3DX12Residency
                                 LRU.TrimToSyncPointInclusive(TotalUsage + INT64(SizeToMakeResident), TotalBudget, pEvictionList, NumObjectsToEvict, GenerationToWaitFor);
 
                                 RESIDENCY_CHECK_RESULT(Device->Evict(NumObjectsToEvict, pEvictionList));
+                                NumObjectsToEvict = 0;
                             }
                             else
                             {
diff --git a/Samples/Desktop/D3D12Residency/src/d3dx12Residency.h b/Samples/Desktop/D3D12Residency/src/d3dx12Residency.h
@@ -406,9 +406,16 @@ namespace D3DX12Residency
 
             HRESULT GPUWait(ID3D12CommandQueue* pQueue)
             {
-                HRESULT hr = pQueue->Wait(pFence, FenceValue);
-                RESIDENCY_CHECK_RESULT(hr);
-                return hr;
+                if (FenceValue > 0)
+                {
+                    HRESULT hr = pQueue->Wait(pFence, FenceValue);
+                    RESIDENCY_CHECK_RESULT(hr);
+                    return hr;
+                }
+                else
+                {
+                    return S_OK;
+                }
             }
 
             HRESULT GPUSignal(ID3D12CommandQueue* pQueue)
@@ -1296,8 +1303,8 @@ namespace D3DX12Residency
                                     if (Device3)
                                     {
                                         hr = Device3->EnqueueMakeResident(D3D12_RESIDENCY_FLAG_NONE,
-                                                                          NumObjectsInBatch,
-                                                                          &pMakeResidentList[BatchStart].pUnderlying,
+                                                                          NumObjects,
+                                                                          &pMakeResidentList[MakeResidentIndex].pUnderlying,
                                                                           AsyncThreadFence.pFence,
                                                                           AsyncThreadFence.FenceValue + 1);
                                         if (SUCCEEDED(hr))
@@ -1332,6 +1339,7 @@ namespace D3DX12Residency
                                 LRU.TrimToSyncPointInclusive(TotalUsage + INT64(SizeToMakeResident), TotalBudget, pEvictionList, NumObjectsToEvict, GenerationToWaitFor);
 
                                 RESIDENCY_CHECK_RESULT(Device->Evict(NumObjectsToEvict, pEvictionList));
+                                NumObjectsToEvict = 0;
                             }
                             else
                             {
diff --git a/Samples/UWP/D3D12Residency/src/d3dx12Residency.h b/Samples/UWP/D3D12Residency/src/d3dx12Residency.h
@@ -406,9 +406,16 @@ namespace D3DX12Residency
 
             HRESULT GPUWait(ID3D12CommandQueue* pQueue)
             {
-                HRESULT hr = pQueue->Wait(pFence, FenceValue);
-                RESIDENCY_CHECK_RESULT(hr);
-                return hr;
+                if (FenceValue > 0)
+                {
+                    HRESULT hr = pQueue->Wait(pFence, FenceValue);
+                    RESIDENCY_CHECK_RESULT(hr);
+                    return hr;
+                }
+                else
+                {
+                    return S_OK;
+                }
             }
 
             HRESULT GPUSignal(ID3D12CommandQueue* pQueue)
@@ -1296,8 +1303,8 @@ namespace D3DX12Residency
                                     if (Device3)
                                     {
                                         hr = Device3->EnqueueMakeResident(D3D12_RESIDENCY_FLAG_NONE,
-                                                                          NumObjectsInBatch,
-                                                                          &pMakeResidentList[BatchStart].pUnderlying,
+                                                                          NumObjects,
+                                                                          &pMakeResidentList[MakeResidentIndex].pUnderlying,
                                                                           AsyncThreadFence.pFence,
                                                                           AsyncThreadFence.FenceValue + 1);
                                         if (SUCCEEDED(hr))
@@ -1332,6 +1339,7 @@ namespace D3DX12Residency
                                 LRU.TrimToSyncPointInclusive(TotalUsage + INT64(SizeToMakeResident), TotalBudget, pEvictionList, NumObjectsToEvict, GenerationToWaitFor);
 
                                 RESIDENCY_CHECK_RESULT(Device->Evict(NumObjectsToEvict, pEvictionList));
+                                NumObjectsToEvict = 0;
                             }
                             else
                             {

Original file line number	Diff line number	Diff line change
`@@ -406,9 +406,16 @@ namespace D3DX12Residency`
`406`	`406`
`407`	`407`	`HRESULT GPUWait(ID3D12CommandQueue* pQueue)`
`408`	`408`	`{`
`409`		`- HRESULT hr = pQueue->Wait(pFence, FenceValue);`
`410`		`- RESIDENCY_CHECK_RESULT(hr);`
`411`		`- return hr;`
	`409`	`+ if (FenceValue > 0)`
	`410`	`+ {`
	`411`	`+ HRESULT hr = pQueue->Wait(pFence, FenceValue);`
	`412`	`+ RESIDENCY_CHECK_RESULT(hr);`
	`413`	`+ return hr;`
	`414`	`+ }`
	`415`	`+ else`
	`416`	`+ {`
	`417`	`+ return S_OK;`
	`418`	`+ }`
`412`	`419`	`}`
`413`	`420`
`414`	`421`	`HRESULT GPUSignal(ID3D12CommandQueue* pQueue)`
`@@ -1332,6 +1339,7 @@ namespace D3DX12Residency`
`1332`	`1339`	`LRU.TrimToSyncPointInclusive(TotalUsage + INT64(SizeToMakeResident), TotalBudget, pEvictionList, NumObjectsToEvict, GenerationToWaitFor);`
`1333`	`1340`
`1334`	`1341`	`RESIDENCY_CHECK_RESULT(Device->Evict(NumObjectsToEvict, pEvictionList));`
	`1342`	`+ NumObjectsToEvict = 0;`
`1335`	`1343`	`}`
`1336`	`1344`	`else`
`1337`	`1345`	`{`