Fix crash with Tracy enabled

Renderer libraries are unloaded, so the zones are transient here.
OpenXRay · Jan 19, 2025 · 8c5d692 · 8c5d692
1 parent 8ffad26
commit 8c5d692
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/src/Layers/xrRenderDX11/dx11HW.cpp b/src/Layers/xrRenderDX11/dx11HW.cpp
@@ -51,7 +51,7 @@ void CHW::OnAppDeactivate()
 //////////////////////////////////////////////////////////////////////
 void CHW::CreateD3D()
 {
-    ZoneScoped;
+    ZoneTransient(tracy_scoped_zone, true);
 
     hDXGI = XRay::LoadModule("dxgi");
     hD3D = XRay::LoadModule("d3d11");
@@ -92,7 +92,7 @@ void CHW::DestroyD3D()
 
 void CHW::CreateDevice(SDL_Window* sdlWnd)
 {
-    ZoneScoped;
+    ZoneTransient(tracy_scoped_zone, true);
 
     CreateD3D();
     if (!Valid)
@@ -148,7 +148,7 @@ void CHW::CreateDevice(SDL_Window* sdlWnd)
 
     const auto createDevice = [&](const D3D_FEATURE_LEVEL* level, const u32 levels)
     {
-        ZoneScopedN("Create device");
+        ZoneTransientN(tracy_scoped_zone_2, "CreateDevice", true);
 
         static const auto d3d11CreateDevice = static_cast<PFN_D3D11_CREATE_DEVICE>(hD3D->GetProcAddress("D3D11CreateDevice"));
         return d3d11CreateDevice(m_pAdapter, D3D_DRIVER_TYPE_UNKNOWN,
@@ -223,15 +223,15 @@ void CHW::CreateDevice(SDL_Window* sdlWnd)
     {
         TaskScheduler->AddTask([this]
         {
-            ZoneScopedN("TracyD3D11Context");
+            ZoneTransientN(tracy_scoped_zone_2, "TracyD3D11Context", true);
             profiler_ctx = TracyD3D11Context(pDevice, get_context(CHW::IMM_CTX_ID));
         });
     }
 
     // Create deferred contexts
     if (ThisInstanceIsGlobal())
     {
-        ZoneScopedN("Create deferred contexts");
+        ZoneTransientN(tracy_scoped_zone_2, "Create deferred contexts", true);
         for (int id = 0; id < R__NUM_PARALLEL_CONTEXTS; ++id)
         {
             R = pDevice->CreateDeferredContext(0, &d3d_contexts_pool[id]);
@@ -282,7 +282,7 @@ void CHW::CreateDevice(SDL_Window* sdlWnd)
 
 bool CHW::CreateSwapChain(HWND hwnd)
 {
-    ZoneScoped;
+    ZoneTransient(tracy_scoped_zone, true);
 
     // Set up the presentation parameters
     DXGI_SWAP_CHAIN_DESC& sd = m_ChainDesc;
@@ -338,7 +338,7 @@ bool CHW::CreateSwapChain2(HWND hwnd)
     if (strstr(Core.Params, "-no_dx11_2"))
         return false;
 
-    ZoneScoped;
+    ZoneTransient(tracy_scoped_zone, true);
 
 #ifdef HAS_DX11_2
     IDXGIFactory2* pFactory2{};

diff --git a/src/Layers/xrRenderGL/glHW.cpp b/src/Layers/xrRenderGL/glHW.cpp
@@ -72,7 +72,7 @@ void CHW::OnAppDeactivate()
 //////////////////////////////////////////////////////////////////////
 void CHW::CreateDevice(SDL_Window* hWnd)
 {
-    ZoneScoped;
+    ZoneTransient(tracy_scoped_zone, true);
 
     m_window = hWnd;
 
@@ -104,7 +104,7 @@ void CHW::CreateDevice(SDL_Window* hWnd)
 
     int version;
     {
-        ZoneScopedN("gladLoadGL");
+        ZoneTransientN(tracy_scoped_zone_2, "gladLoadGL", true);
         version = gladLoadGL(reinterpret_cast<GLADloadfunc>(SDL_GL_GetProcAddress));
     }
     if (version == 0)

diff --git a/src/Layers/xrRenderPC_GL/r2_test_hw.cpp b/src/Layers/xrRenderPC_GL/r2_test_hw.cpp
@@ -34,7 +34,7 @@ class sdl_window_test_helper
 
 BOOL xrRender_test_hw()
 {
-    ZoneScoped;
+    ZoneTransient(tracy_scoped_zone, true);
 
     // Check if minimal required OpenGL features are available
     const sdl_window_test_helper windowTest;

diff --git a/src/Layers/xrRenderPC_GL/xrRender_GL.cpp b/src/Layers/xrRenderPC_GL/xrRender_GL.cpp
@@ -27,7 +27,7 @@ class RGLRendererModule final : public RendererModule
 
     const xr_vector<std::pair<pcstr, int>>& ObtainSupportedModes() override
     {
-        ZoneScoped;
+        ZoneTransient(tracy_scoped_zone, true);
 
         if (CheckCanAddMode())
         {

diff --git a/src/Layers/xrRenderPC_R4/r2_test_hw.cpp b/src/Layers/xrRenderPC_R4/r2_test_hw.cpp
@@ -34,7 +34,7 @@ class DX11TestHelper
 
 BOOL xrRender_test_hw()
 {
-    ZoneScoped;
+    ZoneTransient(tracy_scoped_zone, true);
 
     const DX11TestHelper helper;
     if (!helper.Successful())

diff --git a/src/Layers/xrRenderPC_R4/xrRender_R4.cpp b/src/Layers/xrRenderPC_R4/xrRender_R4.cpp
@@ -28,7 +28,7 @@ class R4RendererModule final : public RendererModule
 
     const xr_vector<std::pair<pcstr, int>>& ObtainSupportedModes() override
     {
-        ZoneScoped;
+        ZoneTransient(tracy_scoped_zone, true);
 
         const BOOL result = CheckCanAddMode();
         if (result != FALSE)