WaitForGpu should be no except

walbourn · Jan 7, 2016 · 85da981 · 85da981
1 parent a3f25ef
commit 85da981
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 28 deletions.
diff --git a/VSIX/Direct3DUWPGame.vsix b/VSIX/Direct3DUWPGame.vsix
diff --git a/d3d12game_uwp_dr/DeviceResources.cpp b/d3d12game_uwp_dr/DeviceResources.cpp
@@ -415,20 +415,24 @@ void DX::DeviceResources::Present()
 }
 
 // Wait for pending GPU work to complete.
-void DX::DeviceResources::WaitForGpu()
+void DX::DeviceResources::WaitForGpu() noexcept
 {
-    if (!m_fence)
-        return;
-
-    // Schedule a Signal command in the GPU queue.
-    DX::ThrowIfFailed(m_commandQueue->Signal(m_fence.Get(), m_fenceValues[m_backBufferIndex]));
-
-    // Wait until the Signal has been processed.
-    DX::ThrowIfFailed(m_fence->SetEventOnCompletion(m_fenceValues[m_backBufferIndex], m_fenceEvent.Get()));
-    WaitForSingleObjectEx(m_fenceEvent.Get(), INFINITE, FALSE);
-
-    // Increment the fence value for the current frame.
-    m_fenceValues[m_backBufferIndex]++;
+    if (m_commandQueue && m_fence && m_fenceEvent.IsValid())
+    {
+        // Schedule a Signal command in the GPU queue.
+        UINT64 fenceValue = m_fenceValues[m_backBufferIndex];
+        if (SUCCEEDED(m_commandQueue->Signal(m_fence.Get(), fenceValue)))
+        {
+            // Wait until the Signal has been processed.
+            if (SUCCEEDED(m_fence->SetEventOnCompletion(fenceValue, m_fenceEvent.Get())))
+            {
+                WaitForSingleObjectEx(m_fenceEvent.Get(), INFINITE, FALSE);
+
+                // Increment the fence value for the current frame.
+                m_fenceValues[m_backBufferIndex]++;
+            }
+        }
+    }
 }
 
 // Prepare to render the next frame.

diff --git a/d3d12game_uwp_dr/DeviceResources.h b/d3d12game_uwp_dr/DeviceResources.h
@@ -29,7 +29,7 @@ namespace DX
         void RegisterDeviceNotify(IDeviceNotify* deviceNotify) { m_deviceNotify = deviceNotify; }
         void Prepare();
         void Present();
-        void WaitForGpu();
+        void WaitForGpu() noexcept;
 
         // Device Accessors.
         RECT GetOutputSize() const { return m_outputSize; }

diff --git a/d3d12game_win32_dr/DeviceResources.cpp b/d3d12game_win32_dr/DeviceResources.cpp
@@ -374,20 +374,24 @@ void DX::DeviceResources::Present()
 }
 
 // Wait for pending GPU work to complete.
-void DX::DeviceResources::WaitForGpu()
+void DX::DeviceResources::WaitForGpu() noexcept
 {
-    if (!m_fence)
-        return;
-
-    // Schedule a Signal command in the GPU queue.
-    DX::ThrowIfFailed(m_commandQueue->Signal(m_fence.Get(), m_fenceValues[m_backBufferIndex]));
-
-    // Wait until the Signal has been processed.
-    DX::ThrowIfFailed(m_fence->SetEventOnCompletion(m_fenceValues[m_backBufferIndex], m_fenceEvent.Get()));
-    WaitForSingleObjectEx(m_fenceEvent.Get(), INFINITE, FALSE);
-
-    // Increment the fence value for the current frame.
-    m_fenceValues[m_backBufferIndex]++;
+    if (m_commandQueue && m_fence && m_fenceEvent.IsValid())
+    {
+        // Schedule a Signal command in the GPU queue.
+        UINT64 fenceValue = m_fenceValues[m_backBufferIndex];
+        if (SUCCEEDED(m_commandQueue->Signal(m_fence.Get(), fenceValue)))
+        {
+            // Wait until the Signal has been processed.
+            if (SUCCEEDED(m_fence->SetEventOnCompletion(fenceValue, m_fenceEvent.Get())))
+            {
+                WaitForSingleObjectEx(m_fenceEvent.Get(), INFINITE, FALSE);
+
+                // Increment the fence value for the current frame.
+                m_fenceValues[m_backBufferIndex]++;
+            }
+        }
+    }
 }
 
 // Prepare to render the next frame.

diff --git a/d3d12game_win32_dr/DeviceResources.h b/d3d12game_win32_dr/DeviceResources.h
@@ -28,7 +28,7 @@ namespace DX
         void RegisterDeviceNotify(IDeviceNotify* deviceNotify) { m_deviceNotify = deviceNotify; }
         void Prepare();
         void Present();
-        void WaitForGpu();
+        void WaitForGpu() noexcept;
 
         // Device Accessors.
         RECT GetOutputSize() const { return m_outputSize; }