From 2307c3b088501c400d6281f862d12e5f80ca7899 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Thu, 7 Jul 2022 14:41:48 +0100
Subject: [PATCH] Add explicit error message for fetching counters without
 developer mode

* Now that we can report proper error messages, also return more information and
  don't use a separate message box.
---
 renderdoc/driver/d3d12/d3d12_counters.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/renderdoc/driver/d3d12/d3d12_counters.cpp b/renderdoc/driver/d3d12/d3d12_counters.cpp
index 8859f0400..da16c9a29 100644
--- a/renderdoc/driver/d3d12/d3d12_counters.cpp
+++ b/renderdoc/driver/d3d12/d3d12_counters.cpp
@@ -593,11 +593,15 @@ rdcarray<CounterResult> D3D12Replay::FetchCounters(const rdcarray<GPUCounter> &c
   // Only supported with developer mode drivers!!!
   hr = m_pDevice->SetStablePowerState(TRUE);
   if(FAILED(hr))
-    MessageBoxA(NULL,
-                "D3D12 counters require Win10 developer mode enabled: Settings > Update & Security "
-                "> For Developers > Developer Mode",
-                "D3D12 Counters Error", MB_ICONWARNING | MB_OK);
-  m_pDevice->CheckHRESULT(hr);
+  {
+    RDResult err;
+    SET_ERROR_RESULT(
+        err, ResultCode::ReplayDeviceLost,
+        "D3D12 counters require Win10 developer mode enabled: Settings > Update & Security "
+        "> For Developers > Developer Mode");
+    m_pDevice->ReportFatalError(err);
+    return ret;
+  }
 
   D3D12GPUTimerCallback cb(m_pDevice, this, timerQueryHeap, pipestatsQueryHeap, occlusionQueryHeap);