Fixes based on review of feature/dx12 PR. (#473)

1 files changed, 12 insertions, 11 deletions

diff --git a/tools/render-test/circular-resource-heap-d3d12.cpp b/tools/render-test/circular-resource-heap-d3d12.cpp
index 7336c3e09..ae8e13822 100644
--- a/tools/render-test/circular-resource-heap-d3d12.cpp
+++ b/tools/render-test/circular-resource-heap-d3d12.cpp
@@ -24,17 +24,18 @@ void D3D12CircularResourceHeap::_freeBlockListResources(const Block* start)
 {
 	if (start)
 	{
-		{
-			ID3D12Resource* resource = start->m_resource;
-			resource->Unmap(0, nullptr);
-			resource->Release();
-		}
-		for (Block* block = start->m_next; block != start; block = block->m_next)
-		{
-			ID3D12Resource* resource = block->m_resource;
-			resource->Unmap(0, nullptr);
-			resource->Release();
-		}
+        const Block* block = start; 
+        do 
+        {
+            ID3D12Resource* resource = block->m_resource;
+
+            resource->Unmap(0, nullptr);
+            resource->Release();
+
+            // Next in list
+            block = block->m_next;
+
+        } while (block != start);
 	} 
 }