From b31b0cc8db10e2b13e57e923667247175d2ab2f2 Mon Sep 17 00:00:00 2001
From: Jake Turner <jake@evansturner.co.uk>
Date: Thu, 3 Apr 2025 09:43:05 +0100
Subject: [PATCH] Add explicit namespace scope for DXIL::ControlFlow usage

Avoids a name clash with rdcshaders::ControlFlow
---
 renderdoc/driver/shaders/dxil/dxil_debug.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/renderdoc/driver/shaders/dxil/dxil_debug.cpp b/renderdoc/driver/shaders/dxil/dxil_debug.cpp
index 644a7a5fe..3024d6ac7 100644
--- a/renderdoc/driver/shaders/dxil/dxil_debug.cpp
+++ b/renderdoc/driver/shaders/dxil/dxil_debug.cpp
@@ -7976,7 +7976,7 @@ ShaderDebugTrace *Debugger::BeginDebug(uint32_t eventId, const DXBC::DXBCContain
         }
       }
 
-      ControlFlow &controlFlow = info.controlFlow;
+      DXIL::ControlFlow &controlFlow = info.controlFlow;
 
       controlFlow.Construct(links);
       info.uniformBlocks = controlFlow.GetUniformBlocks();
@@ -8213,7 +8213,7 @@ ShaderDebugTrace *Debugger::BeginDebug(uint32_t eventId, const DXBC::DXBCContain
   for(auto funcInfosIt = m_FunctionInfos.begin(); funcInfosIt != m_FunctionInfos.end(); ++funcInfosIt)
   {
     FunctionInfo &info = funcInfosIt->second;
-    const ControlFlow &controlFlow = info.controlFlow;
+    const DXIL::ControlFlow &controlFlow = info.controlFlow;
     const rdcarray<uint32_t> loopBlocks = controlFlow.GetLoopBlocks();
     for(ScopedDebugData *scope : m_DebugInfo.scopedDebugDatas)
     {