From ec261a2f857f1f0c6cb283bdb34fb0373f45cb85 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Mon, 4 Nov 2024 13:55:06 +0000
Subject: [PATCH] Use API entry point not source entry point when decompiling
 source

---
 qrenderdoc/Code/Interface/ShaderProcessingTool.cpp       | 2 +-
 qrenderdoc/Windows/PipelineState/PipelineStateViewer.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/qrenderdoc/Code/Interface/ShaderProcessingTool.cpp b/qrenderdoc/Code/Interface/ShaderProcessingTool.cpp
index e0d18c424..2a20eeb53 100644
--- a/qrenderdoc/Code/Interface/ShaderProcessingTool.cpp
+++ b/qrenderdoc/Code/Interface/ShaderProcessingTool.cpp
@@ -279,7 +279,7 @@ ShaderToolOutput ShaderProcessingTool::DisassembleShader(QWidget *window,
       arg = output_file = tmpPath(lit("shader_output"));
     if(arg == lit("{entry_point}"))
     {
-      arg = shaderDetails->debugInfo.entrySourceName;
+      arg = shaderDetails->entryPoint;
       if(arg.isEmpty())
         arg = lit("main");
     }
diff --git a/qrenderdoc/Windows/PipelineState/PipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/PipelineStateViewer.cpp
index 7c3daf8e6..9ec286464 100644
--- a/qrenderdoc/Windows/PipelineState/PipelineStateViewer.cpp
+++ b/qrenderdoc/Windows/PipelineState/PipelineStateViewer.cpp
@@ -1021,8 +1021,8 @@ IShaderViewer *PipelineStateViewer::EditDecompiledSource(const ShaderProcessingT
     if(flag.name == "@spirver")
       flags.flags.push_back(flag);
 
-  IShaderViewer *sv = EditShader(id, shaderDetails->stage, shaderDetails->debugInfo.entrySourceName,
-                                 flags, KnownShaderTool::Unknown, tool.output, files);
+  IShaderViewer *sv = EditShader(id, shaderDetails->stage, shaderDetails->entryPoint, flags,
+                                 KnownShaderTool::Unknown, tool.output, files);
 
   sv->ShowErrors(out.log);