Fixed crash on device reset

mrsharpoblunto · May 13, 2023 · 5793091 · 5793091
1 parent 0348351
commit 5793091
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/Matchstick/src/core/MGDFD3DAppFramework.cpp b/Matchstick/src/core/MGDFD3DAppFramework.cpp
@@ -633,7 +633,7 @@ INT32 D3DAppFramework::Run() {
               WaitForSingleObjectEx(_frameWaitableObject, 1000, true);
           if (wait == WAIT_ABANDONED || wait == WAIT_TIMEOUT ||
               wait == WAIT_FAILED) {
-            FATALERROR(this, "Failed to wait on FrameWaitableObject");
+            LOG("Failed to wait on FrameWaitableObject", MGDF_LOG_ERROR);
           }
         }
 

diff --git a/Matchstick/src/core/core.impl/MGDFTimer.cpp b/Matchstick/src/core/core.impl/MGDFTimer.cpp
@@ -123,9 +123,11 @@ HRESULT GPUPerformanceCounter::DoBegin(std::map<std::string, std::string> &tags,
       desc.Query = D3D11_QUERY_TIMESTAMP;
       desc.MiscFlags = 0;
 
-      if (FAILED(
-              _device->CreateQuery(&desc, _beginQueries.emplace().Assign())) ||
-          FAILED(_device->CreateQuery(&desc, _endQueries.emplace().Assign()))) {
+      if (!(SUCCEEDED(_device->CreateQuery(&desc,
+                                           _beginQueries.emplace().Assign())) &&
+            SUCCEEDED(
+                _device->CreateQuery(&desc, _endQueries.emplace().Assign())))) {
+        Reset();
         LOG("Failed to create GPU timing queries", MGDF_LOG_ERROR);
         return E_FAIL;
       }