Added rdcstr DXIL::Program::GetDebugStatus()

returns "DXIL Debugging is not supported"
baldurk · May 9, 2024 · 8ba66e9 · 8ba66e9
1 parent b75fa90
commit 8ba66e9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/renderdoc/driver/shaders/dxbc/dxbc_reflect.cpp b/renderdoc/driver/shaders/dxbc/dxbc_reflect.cpp
@@ -25,6 +25,7 @@
 #include "dxbc_reflect.h"
 #include "common/formatting.h"
 #include "core/core.h"
+#include "driver/shaders/dxil/dxil_bytecode.h"
 #include "dxbc_bytecode.h"
 #include "dxbc_container.h"
 
@@ -373,18 +374,15 @@ void MakeShaderReflection(DXBC::DXBCContainer *dxbc, const ShaderEntryPoint &ent
   if(dxbc->GetDXBCByteCode())
   {
     refl->debugInfo.debugStatus = dxbc->GetDXBCByteCode()->GetDebugStatus();
-
-    refl->debugInfo.debuggable = refl->debugInfo.debugStatus.empty();
   }
   else
   {
-    refl->debugInfo.debuggable = false;
-
     if(dxbc->GetDXILByteCode())
-      refl->debugInfo.debugStatus = "Debugging DXIL is not supported";
+      refl->debugInfo.debugStatus = dxbc->GetDXILByteCode()->GetDebugStatus();
     else
       refl->debugInfo.debugStatus = "Shader contains no recognised bytecode";
   }
+  refl->debugInfo.debuggable = refl->debugInfo.debugStatus.empty();
 
   refl->encoding = ShaderEncoding::DXBC;
   refl->debugInfo.compiler = KnownShaderTool::fxc;

diff --git a/renderdoc/driver/shaders/dxil/dxil_bytecode.h b/renderdoc/driver/shaders/dxil/dxil_bytecode.h
@@ -1265,6 +1265,7 @@ class Program : public DXBC::IDebugInfo
   const bytebuf &GetBytes() const { return m_Bytes; }
   void FetchComputeProperties(DXBC::Reflection *reflection);
   DXBC::Reflection *GetReflection();
+  rdcstr GetDebugStatus();
   rdcarray<ShaderEntryPoint> GetEntryPoints();
   void FillRayPayloads(
       Program *executable,

diff --git a/renderdoc/driver/shaders/dxil/dxil_reflect.cpp b/renderdoc/driver/shaders/dxil/dxil_reflect.cpp
@@ -1679,6 +1679,11 @@ DXBC::Reflection *Program::GetReflection()
   return refl;
 }
 
+rdcstr Program::GetDebugStatus()
+{
+  return "Debugging DXIL is not supported";
+}
+
 void Program::GetLineInfo(size_t instruction, uintptr_t offset, LineColumnInfo &lineInfo) const
 {
   lineInfo = LineColumnInfo();