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

Give extensions their own OutputRedirector object to identify them

Browse Source
This commit is contained in:
baldurk
2026-08-13 17:46:40 +01:00
parent 3ff393c91f
commit 60b989f2b7
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Code/pyrenderdoc/PythonContext.cpp
+19 -9
View File
@@ -131,6 +131,7 @@ struct OutputRedirector
};
int isStdError;
bool block;
rdcstr extension;
PyObject *compiled;
PyObject *chain_trace;
};
@@ -1136,11 +1137,6 @@ QString PythonContext::LoadExtension(ICaptureContext &ctx, const rdcstr &extensi
PyObject *ext = NULL;
current_global_handle = PyObject_SafeGetAttrString(sysobj, "_renderdoc_internal");
if(!current_global_handle)
qCritical() << "couldn't get _renderdoc_internal";
QString typeStr;
QString valueStr;
int finalLine = -1;
@@ -1236,7 +1232,18 @@ QString PythonContext::LoadExtension(ICaptureContext &ctx, const rdcstr &extensi
{
extensions[extension] = ext;
PyModule_AddObject(ext, "_renderdoc_internal", current_global_handle);
// for compatibility with earlier versions of python that took a char * instead of const char *
char noparams[1] = "";
PyObject *ext_context = PyObject_CallFunction((PyObject *)&OutputRedirectorType, noparams);
OutputRedirector *redir = (OutputRedirector *)ext_context;
redir->isStdError = 0;
redir->context = NULL;
redir->block = false;
redir->extension = extension;
PyModule_AddObject(ext, "_renderdoc_internal", ext_context);
}
if(ext)
@@ -1334,8 +1341,6 @@ QString PythonContext::LoadExtension(ICaptureContext &ctx, const rdcstr &extensi
Py_DecRef(syspath);
current_global_handle = NULL;
return ret;
}
@@ -1900,7 +1905,8 @@ void PythonContext::outstream_del(PyObject *self)
PythonContext *context = redirector->context;
// delete the context on the UI thread.
GUIInvoke::call(context, [context]() { delete context; });
if(context)
GUIInvoke::call(context, [context]() { delete context; });
}
}
@@ -2323,6 +2329,10 @@ extern "C" void HandleException(PyObject *global_handle)
Py_XDECREF(code);
linenum = PyFrame_GetLineNumber(frame);
}
else if(redirector)
{
filename = redirector->extension;
}
RENDERDOC_LogMessage(LogType::Error, "EXTN", filename, linenum, exString);
}