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

Protect access to TextureViewer from custom shader editor

Browse Source 
* This means we don't crash if the custom shader editor is kept open even when
  the texture viewer is closed.
This commit is contained in:
baldurk
2018-09-18 12:46:23 +01:00
parent 871685fe86
commit 684e814eb7
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Windows/TextureViewer.cpp
+17 -7
View File
@@ -3871,13 +3871,16 @@ void TextureViewer::on_customEdit_clicked()
rdcstrpairs files;
files.push_back(make_rdcpair<rdcstr, rdcstr>(filename, src));
QPointer<TextureViewer> thisPointer(this);
IShaderViewer *s = m_Ctx.EditShader(
true, ShaderStage::Fragment, lit("main"), files,
IsD3D(m_Ctx.APIProps().localRenderer) ? ShaderEncoding::HLSL : ShaderEncoding::GLSL,
ShaderCompileFlags(),
// Save Callback
[this, key, filename, path](ICaptureContext *ctx, IShaderViewer *viewer, ShaderEncoding encoding,
ShaderCompileFlags flags, rdcstr entryFunc, bytebuf bytes) {
[thisPointer, key, filename, path](ICaptureContext *ctx, IShaderViewer *viewer,
ShaderEncoding encoding, ShaderCompileFlags flags,
rdcstr entryFunc, bytebuf bytes) {
{
QFile fileHandle(path);
if(fileHandle.open(QFile::WriteOnly | QIODevice::Truncate | QIODevice::Text))
@@ -3886,18 +3889,25 @@ void TextureViewer::on_customEdit_clicked()
fileHandle.close();
// watcher doesn't trigger on internal modifications
reloadCustomShaders(filename);
if(thisPointer)
thisPointer->reloadCustomShaders(filename);
}
else
{
RDDialog::critical(
this, tr("Cannot save shader"),
tr("Couldn't save file for shader %1\n%2").arg(filename).arg(fileHandle.errorString()));
if(thisPointer)
{
RDDialog::critical(
thisPointer, tr("Cannot save shader"),
tr("Couldn't save file for shader %1\n%2").arg(filename).arg(fileHandle.errorString()));
}
}
}
},
[this, key](ICaptureContext *ctx) { m_CustomShaderEditor.remove(key); });
[thisPointer, key](ICaptureContext *ctx) {
if(thisPointer)
thisPointer->m_CustomShaderEditor.remove(key);
});
m_CustomShaderEditor[key] = s;