Handle more error cases for VirtualContext

baldurk · baldurk · commit f96874e5d15d · 2017-08-02T15:30:56.000+01:00
diff --git a/renderdoc/driver/ihv/amd/amd_isa.cpp b/renderdoc/driver/ihv/amd/amd_isa.cpp
@@ -400,9 +400,10 @@ 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 || result.strStdout.find("Error") != string::npos)
+  if(result.retCode != 0 || result.strStdout.find("Error") != string::npos ||
+     result.strStdout.empty() || !FileIO::exists(outPath.c_str()))
   {
-    return "; Failed to Disassemble\n\n; " + result.strStdout;
+    return "; Failed to Disassemble - check AMD driver is currently running\n\n; " + result.strStdout;
   }
 
   // remove artifacts we don't need

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