lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-04 17:10:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

QRenderDoc: Fetch texid to display correctly for Present() calls

Browse Source
This commit is contained in:
baldurk
2015-10-28 14:54:42 +01:00
parent 5363a6b9d2
commit f9b69b1002
2 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Windows/TextureViewer.cpp
+20 -18
View File
@@ -125,21 +125,7 @@ void TextureViewer::on_render_clicked(QMouseEvent *e)
{
m_Core->Renderer()->AsyncInvoke([this,x,y](IReplayRenderer *) {
ResourceId id;
if(m_Core->APIProps().pipelineType == ePipelineState_D3D11)
{
id = m_Core->CurD3D11PipelineState.m_OM.RenderTargets[0].Resource;
}
else if(m_Core->APIProps().pipelineType == ePipelineState_OpenGL)
{
id = m_Core->CurGLPipelineState.m_FB.m_DrawFBO.Color[0].Obj;
}
else
{
const VulkanPipelineState &pipe = m_Core->CurVulkanPipelineState;
if(pipe.Pass.renderpass.colorAttachments.count > 0)
id = pipe.Pass.framebuffer.attachments[pipe.Pass.renderpass.colorAttachments[0]].img;
}
ResourceId id = m_TexDisplay.texid;
PixelValue val;
ReplayOutput_PickPixel(m_Output, id, false, x, y, 0, 0, 0, &val);
@@ -191,7 +177,9 @@ void TextureViewer::OnLogfileClosed()
void TextureViewer::OnEventSelected(uint32_t frameID, uint32_t eventID)
{
m_Core->Renderer()->AsyncInvoke([this](IReplayRenderer *) {
TextureDisplay d;
TextureDisplay &d = m_TexDisplay;
if(m_Core->APIProps().pipelineType == ePipelineState_D3D11)
{
d.texid = m_Core->CurD3D11PipelineState.m_OM.RenderTargets[0].Resource;
@@ -204,7 +192,14 @@ void TextureViewer::OnEventSelected(uint32_t frameID, uint32_t eventID)
{
const VulkanPipelineState &pipe = m_Core->CurVulkanPipelineState;
if(pipe.Pass.renderpass.colorAttachments.count > 0)
d.texid = pipe.Pass.framebuffer.attachments[pipe.Pass.renderpass.colorAttachments[0]].img;
d.texid = pipe.Pass.framebuffer.attachments[pipe.Pass.renderpass.colorAttachments[0]].img;
if(d.texid == ResourceId())
{
const FetchDrawcall *draw = m_Core->CurDrawcall();
if(draw)
d.texid = draw->copyDestination;
}
}
d.mip = 0;
d.sampleIdx = ~0U;
@@ -226,6 +221,13 @@ void TextureViewer::OnEventSelected(uint32_t frameID, uint32_t eventID)
d.Alpha = false;
m_Output->SetTextureDisplay(d);
GUIInvoke::call([this]() { ui->render->update(); });
FetchTexture *tex = m_Core->GetTexture(d.texid);
GUIInvoke::call([this,tex]() {
if(tex)
ui->renderContainer->setWindowTitle(tr(tex->name.elems));
ui->render->update();
});
});
}
qrenderdoc/Windows/TextureViewer.h
+2
View File
@@ -30,6 +30,8 @@ class TextureViewer : public QFrame, public ILogViewerForm
Ui::TextureViewer *ui;
Core *m_Core;
IReplayOutput *m_Output;
TextureDisplay m_TexDisplay;
};
#endif // TEXTUREVIEWER_H