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

In python extensions, set pyrenderdoc global before calling register()

Browse Source
This commit is contained in:
baldurk
2026-08-13 17:46:44 +01:00
parent 4baf001be9
commit 16a24406b2
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Code/pyrenderdoc/PythonContext.cpp
+17 -17
View File
@@ -1296,6 +1296,8 @@ QString PythonContext::LoadExtension(ICaptureContext &ctx, const rdcstr &extensi
ext = PyImport_ReloadModule(extensions[extension]);
}
PyObject *pyctx = PassObjectToPython((rdcstr(TypeName<ICaptureContext>()) + " *").c_str(), &ctx);
// if import succeeded, store this extension module in our map. If import failed, we might have
// failed a reimport in which case the original module is still there and valid, so don't
// overwrite the value.
@@ -1316,6 +1318,19 @@ QString PythonContext::LoadExtension(ICaptureContext &ctx, const rdcstr &extensi
redir->extension = extension;
PyModule_AddObject(ext, "_renderdoc_internal", ext_context);
Py_XINCREF(pyctx);
int pyret = PyModule_AddObject(ext, "pyrenderdoc", pyctx);
if(pyret != 0)
{
Py_XDECREF(pyctx);
qCritical() << "Couldn't set pyrenderdoc global in loaded module";
ret += tr("Couldn't set pyrenderdoc global in loaded module\n");
ext = NULL;
}
}
if(ext)
@@ -1327,9 +1342,6 @@ QString PythonContext::LoadExtension(ICaptureContext &ctx, const rdcstr &extensi
if(register_func)
{
PyObject *pyctx =
PassObjectToPython((rdcstr(TypeName<ICaptureContext>()) + " *").c_str(), &ctx);
PyObject *retval = NULL;
if(pyctx)
{
@@ -1351,20 +1363,6 @@ QString PythonContext::LoadExtension(ICaptureContext &ctx, const rdcstr &extensi
}
Py_XDECREF(retval);
if(ext)
{
int pyret = PyModule_AddObject(ext, "pyrenderdoc", pyctx);
if(pyret != 0)
{
qCritical() << "Couldn't set pyrenderdoc global in loaded module";
ret += tr("Couldn't set pyrenderdoc global in loaded module\n");
ext = NULL;
}
}
Py_XDECREF(pyctx);
}
else
{
@@ -1378,6 +1376,8 @@ QString PythonContext::LoadExtension(ICaptureContext &ctx, const rdcstr &extensi
ext = NULL;
}
Py_XDECREF(pyctx);
if(ext)
{
emit m_ExtensionContext->extensionLoaded(extension);