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

Remove parent widget parameter from shader view/edit/debug functions

Browse Source
This commit is contained in:
baldurk
2017-04-18 14:57:48 +01:00
parent 35f9c53486
commit ea1dbc27f9
11 changed files with 27 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Code/CaptureContext.cpp
+7 -8
View File
@@ -775,25 +775,24 @@ void CaptureContext::ShowStatisticsViewer()
IShaderViewer *CaptureContext::EditShader(bool customShader, const QString &entryPoint,
const QStringMap &files,
IShaderViewer::SaveCallback saveCallback,
IShaderViewer::CloseCallback closeCallback, QWidget *parent)
IShaderViewer::CloseCallback closeCallback)
{
return ShaderViewer::EditShader(*this, customShader, entryPoint, files, saveCallback,
closeCallback, parent);
closeCallback, m_MainWindow->Widget());
}
IShaderViewer *CaptureContext::DebugShader(const ShaderBindpointMapping *bind,
const ShaderReflection *shader, ShaderStage stage,
ShaderDebugTrace *trace, const QString &debugContext,
QWidget *parent)
ShaderDebugTrace *trace, const QString &debugContext)
{
return ShaderViewer::DebugShader(*this, bind, shader, stage, trace, debugContext, parent);
return ShaderViewer::DebugShader(*this, bind, shader, stage, trace, debugContext,
m_MainWindow->Widget());
}
IShaderViewer *CaptureContext::ViewShader(const ShaderBindpointMapping *bind,
const ShaderReflection *shader, ShaderStage stage,
QWidget *parent)
const ShaderReflection *shader, ShaderStage stage)
{
return ShaderViewer::ViewShader(*this, bind, shader, stage, parent);
return ShaderViewer::ViewShader(*this, bind, shader, stage, m_MainWindow->Widget());
}
IBufferViewer *CaptureContext::ViewBuffer(uint64_t byteOffset, uint64_t byteSize, ResourceId id,
qrenderdoc/Code/CaptureContext.h
+3 -3
View File
@@ -148,14 +148,14 @@ public:
IShaderViewer *EditShader(bool customShader, const QString &entryPoint, const QStringMap &files,
IShaderViewer::SaveCallback saveCallback,
IShaderViewer::CloseCallback closeCallback, QWidget *parent) override;
IShaderViewer::CloseCallback closeCallback) override;
IShaderViewer *DebugShader(const ShaderBindpointMapping *bind, const ShaderReflection *shader,
ShaderStage stage, ShaderDebugTrace *trace,
const QString &debugContext, QWidget *parent) override;
const QString &debugContext) override;
IShaderViewer *ViewShader(const ShaderBindpointMapping *bind, const ShaderReflection *shader,
ShaderStage stage, QWidget *parent) override;
ShaderStage stage) override;
IBufferViewer *ViewBuffer(uint64_t byteOffset, uint64_t byteSize, ResourceId id,
const QString &format = "") override;
qrenderdoc/Code/Interface/QRDInterface.h
+4 -7
View File
@@ -392,17 +392,14 @@ struct ICaptureContext
virtual IShaderViewer *EditShader(bool customShader, const QString &entryPoint,
const QStringMap &files, IShaderViewer::SaveCallback saveCallback,
IShaderViewer::CloseCallback closeCallback, QWidget *parent) = 0;
IShaderViewer::CloseCallback closeCallback) = 0;
virtual IShaderViewer *DebugShader(const ShaderBindpointMapping *bind,
const ShaderReflection *shader, ShaderStage stage,
ShaderDebugTrace *trace, const QString &debugContext,
QWidget *parent) = 0;
ShaderDebugTrace *trace, const QString &debugContext) = 0;
virtual IShaderViewer *ViewShader(const ShaderBindpointMapping *bind,
const ShaderReflection *shader, ShaderStage stage,
QWidget *parent) = 0;
const ShaderReflection *shader, ShaderStage stage) = 0;
virtual IBufferViewer *ViewBuffer(uint64_t byteOffset, uint64_t byteSize, ResourceId id,
const QString &format = "") = 0;
virtual IBufferViewer *ViewTextureAsBuffer(uint32_t arrayIdx, uint32_t mip, ResourceId id,