VirtualContext.exe doesn't return non-0 error code if context fails

baldurk · baldurk · commit 26c89b4a3349 · 2017-08-01T11:04:11.000+01:00
diff --git a/renderdoc/driver/ihv/amd/amd_isa.cpp b/renderdoc/driver/ihv/amd/amd_isa.cpp
@@ -398,9 +398,9 @@ std::string Disassemble(ShaderStage stage, const std::vector<std::string> &glsl,
   Process::ProcessResult result = {};
   Process::LaunchProcess(vc.c_str(), dirname(vc).c_str(), cmdLine.c_str(), &result);
 
-  if(result.retCode != 0)
+  if(result.retCode != 0 || result.strStdout.find("Error") != string::npos)
   {
-    return "; Failed to Disassemble - " + result.strStdout;
+    return "; Failed to Disassemble\n\n; " + result.strStdout;
   }
 
   // remove artifacts we don't need

Original file line number	Diff line number	Diff line change
`@@ -398,9 +398,9 @@ std::string Disassemble(ShaderStage stage, const std::vector<std::string> &glsl,`
`398`	`398`	`Process::ProcessResult result = {};`
`399`	`399`	`Process::LaunchProcess(vc.c_str(), dirname(vc).c_str(), cmdLine.c_str(), &result);`
`400`	`400`
`401`		`- if(result.retCode != 0)`
	`401`	`+ if(result.retCode != 0 \|\| result.strStdout.find("Error") != string::npos)`
`402`	`402`	`{`
`403`		`- return "; Failed to Disassemble - " + result.strStdout;`
	`403`	`+ return "; Failed to Disassemble\n\n; " + result.strStdout;`
`404`	`404`	`}`
`405`	`405`
`406`	`406`	`// remove artifacts we don't need`