From 5fbf49a304908961098efcb7ac396a83750c8fda Mon Sep 17 00:00:00 2001 From: baldurk Date: Thu, 27 Apr 2017 17:57:54 +0100 Subject: [PATCH] Fix pixel history view launching shader debugger on qrenderdoc --- qrenderdoc/Windows/PixelHistoryView.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/qrenderdoc/Windows/PixelHistoryView.cpp b/qrenderdoc/Windows/PixelHistoryView.cpp index edd63393c..041913adc 100644 --- a/qrenderdoc/Windows/PixelHistoryView.cpp +++ b/qrenderdoc/Windows/PixelHistoryView.cpp @@ -637,13 +637,11 @@ void PixelHistoryView::startDebug(EventTag tag) ShaderDebugTrace *trace = NULL; - bool success = false; - - m_Ctx.Replay().BlockInvoke([this, &success, &trace](IReplayController *r) { + m_Ctx.Replay().BlockInvoke([this, &trace](IReplayController *r) { trace = r->DebugPixel((uint32_t)m_Pixel.x(), (uint32_t)m_Pixel.y(), m_Display.sampleIdx, ~0U); }); - if(!success || trace->states.count == 0) + if(trace->states.count == 0) { RDDialog::critical(this, tr("Debug Error"), tr("Error debugging pixel.")); delete trace; @@ -662,7 +660,7 @@ void PixelHistoryView::startDebug(EventTag tag) IShaderViewer *s = m_Ctx.DebugShader(&bindMapping, shaderDetails, ShaderStage::Pixel, trace, debugContext); - m_Ctx.AddDockWindow(s->Widget(), DockReference::AddTo, m_Ctx.GetMainWindow()->Widget()); + m_Ctx.AddDockWindow(s->Widget(), DockReference::MainToolArea, NULL); }); }