lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-08-24 23:46:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compile fixes

Browse Source
This commit is contained in:
baldurk
2026-08-13 23:23:27 +01:00
parent 75682ad346
commit 1aeac957bd
3 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Code/pyrenderdoc/PythonInvokers.cpp
+5 -7
View File
@@ -449,7 +449,7 @@ struct ReplayControllerInvoker : IReplayController
if(scriptContext)
scriptContext->PausePythonThreading();
m_Ctx.Replay().BlockInvoke(
[this, ptr, params...](IReplayController *replay) { (replay->*ptr)(params...); });
[ptr, params...](IReplayController *replay) { (replay->*ptr)(params...); });
if(scriptContext)
scriptContext->ResumePythonThreading();
}
@@ -461,9 +461,8 @@ struct ReplayControllerInvoker : IReplayController
PythonContext *scriptContext = m_Shell->GetScriptContext();
if(scriptContext)
scriptContext->PausePythonThreading();
m_Ctx.Replay().BlockInvoke([this, &ret, ptr, params...](IReplayController *replay) {
ret = (replay->*ptr)(params...);
});
m_Ctx.Replay().BlockInvoke(
[&ret, ptr, params...](IReplayController *replay) { ret = (replay->*ptr)(params...); });
if(scriptContext)
scriptContext->ResumePythonThreading();
return ret;
@@ -476,9 +475,8 @@ struct ReplayControllerInvoker : IReplayController
PythonContext *scriptContext = m_Shell->GetScriptContext();
if(scriptContext)
scriptContext->PausePythonThreading();
m_Ctx.Replay().BlockInvoke([this, &ret, ptr, params...](IReplayController *replay) {
ret = &(replay->*ptr)(params...);
});
m_Ctx.Replay().BlockInvoke(
[&ret, ptr, params...](IReplayController *replay) { ret = &(replay->*ptr)(params...); });
if(scriptContext)
scriptContext->ResumePythonThreading();
return *ret;
qrenderdoc/Windows/MainWindow.cpp
+2 -2
View File
@@ -757,7 +757,7 @@ void MainWindow::OnCaptureTrigger(const QString &exe, const QString &workingDir,
if(!PromptCloseCapture())
return;
ExecuteResult ret;
ExecuteResult ret = {};
LambdaThread *th = new LambdaThread([this, exe, workingDir, cmdLine, env, opts, callback, &ret]() {
if(isUnshareableDeviceInUse())
@@ -825,7 +825,7 @@ void MainWindow::OnInjectTrigger(uint32_t PID, const rdcarray<EnvironmentModific
if(!PromptCloseCapture())
return;
ExecuteResult ret;
ExecuteResult ret = {};
LambdaThread *th = new LambdaThread([this, PID, env, name, opts, callback, &ret]() {
QString capturefile = m_Ctx.TempCaptureFilename(name);
qrenderdoc/Windows/PythonShell.cpp
+13 -13
View File
@@ -697,17 +697,17 @@ void PythonShell::editorTab_Menu(const QPoint &pos)
contextMenu.addAction(&closeOtherTabs);
contextMenu.addAction(&closeRightTabs);
QObject::connect(&closeTab, &QAction::triggered, [this, editorTabs, tabIndex]() {
QObject::connect(&closeTab, &QAction::triggered, [editorTabs, tabIndex]() {
// remove the tab at this index
delete editorTabs->widget(tabIndex);
});
QObject::connect(&closeRightTabs, &QAction::triggered, [this, editorTabs, tabIndex]() {
QObject::connect(&closeRightTabs, &QAction::triggered, [editorTabs, tabIndex]() {
for(int i = editorTabs->count() - 1; i > tabIndex; i--)
delete editorTabs->widget(i);
});
QObject::connect(&closeOtherTabs, &QAction::triggered, [this, editorTabs, tabIndex]() {
QObject::connect(&closeOtherTabs, &QAction::triggered, [editorTabs, tabIndex]() {
for(int i = editorTabs->count() - 1; i >= 0; i--)
if(i != tabIndex)
delete editorTabs->widget(i);
@@ -950,7 +950,7 @@ void PythonShell::makeEditor(rdcstr filename, rdcstr text)
QObject::connect(sc, &ScintillaEdit::charAdded, [this, sc](int ch) { doAutocomplete(sc); });
QObject::connect(sc, &ScintillaEdit::buttonPressed,
[this, sc](QMouseEvent *ev) { hideFunccompleteTooltip(); });
[this](QMouseEvent *ev) { hideFunccompleteTooltip(); });
QObject::connect(sc, &ScintillaEdit::keyPressed, [this, sc](QKeyEvent *ev) {
if(ev->key() == Qt::Key_Space && (ev->modifiers() & Qt::ControlModifier))
@@ -1825,8 +1825,8 @@ void PythonShell::editor_contextMenu(const QPoint &pos)
QAction undo(tr("Undo"), this);
QAction redo(tr("Redo"), this);
QObject::connect(&undo, &QAction::triggered, [this, editor] { editor->undo(); });
QObject::connect(&redo, &QAction::triggered, [this, editor] { editor->redo(); });
QObject::connect(&undo, &QAction::triggered, [editor] { editor->undo(); });
QObject::connect(&redo, &QAction::triggered, [editor] { editor->redo(); });
undo.setEnabled(editor->canUndo());
redo.setEnabled(editor->canRedo());
@@ -1840,15 +1840,15 @@ void PythonShell::editor_contextMenu(const QPoint &pos)
QAction pasteText(tr("Paste"), this);
QAction deleteText(tr("Delete"), this);
QObject::connect(&cutText, &QAction::triggered, [this, editor] { editor->cut(); });
QObject::connect(&cutText, &QAction::triggered, [editor] { editor->cut(); });
QObject::connect(&copyText, &QAction::triggered, [this, editor] {
QObject::connect(&copyText, &QAction::triggered, [editor] {
editor->copyRange(editor->selectionStart(), editor->selectionEnd());
});
QObject::connect(&pasteText, &QAction::triggered, [this, editor] { editor->paste(); });
QObject::connect(&pasteText, &QAction::triggered, [editor] { editor->paste(); });
QObject::connect(&deleteText, &QAction::triggered, [this, editor] {
QObject::connect(&deleteText, &QAction::triggered, [editor] {
editor->deleteRange(editor->selectionStart(), editor->selectionEnd());
});
@@ -1868,7 +1868,7 @@ void PythonShell::editor_contextMenu(const QPoint &pos)
pasteText.setEnabled(editor->canPaste());
QAction selectAll(tr("Select All"), this);
QObject::connect(&selectAll, &QAction::triggered, [this, editor] { editor->selectAll(); });
QObject::connect(&selectAll, &QAction::triggered, [editor] { editor->selectAll(); });
contextMenu.addAction(&selectAll);
RDDialog::show(&contextMenu, editor->viewport()->mapToGlobal(pos));
@@ -1963,7 +1963,7 @@ void PythonShell::projectExplorer_contextMenu(const QPoint &pos)
}
QObject::connect(&explorerOpen, &QAction::triggered,
[this, diskLocation]() { QDesktopServices::openUrl(diskLocation); });
[diskLocation]() { QDesktopServices::openUrl(diskLocation); });
QObject::connect(&viewOutput, &QAction::triggered, [this, itemPath]() {
ShowOutput();
@@ -1986,7 +1986,7 @@ void PythonShell::projectExplorer_contextMenu(const QPoint &pos)
[this, item]() { on_projectExplorer_itemActivated(item, 0); });
QObject::connect(&explorerOpen, &QAction::triggered,
[this, diskLocation]() { QDesktopServices::openUrl(diskLocation); });
[diskLocation]() { QDesktopServices::openUrl(diskLocation); });
}
}
else if(item == m_UIExtensions)