lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-04 09:00:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support a NULL window for functions that only need it for dialogs

Browse Source 
* Primarily useful for Python where threading can cause problems, and there's no
  need.
This commit is contained in:
baldurk
2018-07-11 16:03:37 +01:00
parent 64c6c1affc
commit b955ef0b52
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Code/Interface/SPIRVDisassembler.cpp
+10 -7
View File
@@ -105,13 +105,16 @@ rdcstr SPIRVDisassembler::DisassembleShader(QWidget *window, const ShaderReflect
if(process.exitStatus() != QProcess::NormalExit || process.exitCode() != 0)
{
GUIInvoke::call(window, [window]() {
RDDialog::critical(
window, QApplication::translate("SPIRVDisassembler", "Error running disassembler"),
QApplication::translate(
"SPIRVDisassembler",
"There was an error invoking the external SPIR-V disassembler."));
});
if(window)
{
GUIInvoke::call(window, [window]() {
RDDialog::critical(
window, QApplication::translate("SPIRVDisassembler", "Error running disassembler"),
QApplication::translate(
"SPIRVDisassembler",
"There was an error invoking the external SPIR-V disassembler."));
});
}
}
if(writesToFile)
qrenderdoc/Code/ReplayManager.cpp
+6 -6
View File
@@ -165,14 +165,14 @@ rdcstr ReplayManager::CopyCaptureToRemote(const rdcstr &localpath, QWidget *wind
rdcstr remotepath;
bool copied = false;
QAtomicInt copied = 0;
float progress = 0.0f;
auto lambda = [this, localpath, &remotepath, &progress, &copied](IReplayController *r) {
QMutexLocker autolock(&m_RemoteLock);
remotepath =
m_Remote->CopyCaptureToRemote(localpath.c_str(), [&progress](float p) { progress = p; });
copied = true;
copied = 1;
};
// we should never have the thread running at this point, but let's be safe.
@@ -187,7 +187,7 @@ rdcstr ReplayManager::CopyCaptureToRemote(const rdcstr &localpath, QWidget *wind
thread->start();
}
ShowProgressDialog(window, tr("Transferring..."), [&copied]() { return copied; },
ShowProgressDialog(window, tr("Transferring..."), [&copied]() { return copied == 0; },
[&progress]() { return progress; });
return remotepath;
@@ -199,14 +199,14 @@ void ReplayManager::CopyCaptureFromRemote(const rdcstr &remotepath, const rdcstr
if(!m_Remote)
return;
bool copied = false;
QAtomicInt copied = 0;
float progress = 0.0f;
auto lambda = [this, localpath, remotepath, &progress, &copied](IReplayController *r) {
QMutexLocker autolock(&m_RemoteLock);
m_Remote->CopyCaptureFromRemote(remotepath.c_str(), localpath.c_str(),
[&progress](float p) { progress = p; });
copied = true;
copied = 1;
};
// we should never have the thread running at this point, but let's be safe.
@@ -221,7 +221,7 @@ void ReplayManager::CopyCaptureFromRemote(const rdcstr &remotepath, const rdcstr
thread->start();
}
ShowProgressDialog(window, tr("Transferring..."), [&copied]() { return copied; },
ShowProgressDialog(window, tr("Transferring..."), [&copied]() { return copied == 0; },
[&progress]() { return progress; });
}