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

Don't conflict between C# UI and replay output flipping pixel context

Browse Source
This commit is contained in:
baldurk
2015-10-16 15:02:44 +02:00
parent 91ac384736
commit 9d3202ae5f
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/replay/replay_output.cpp
+3 -1
View File
@@ -358,7 +358,6 @@ void ReplayOutput::DisplayContext()
if(m_PixelContext.outputID == 0) return;
float color[4] = {0.0f, 0.0f, 0.0f, 0.0f};
m_pDevice->BindOutputWindow(m_PixelContext.outputID, false);
m_pDevice->ClearOutputWindowColour(m_PixelContext.outputID, color);
if(
(m_Config.m_Type != eOutputType_TexDisplay) ||
@@ -366,9 +365,12 @@ void ReplayOutput::DisplayContext()
(m_RenderData.texDisplay.texid == ResourceId())
)
{
m_pDevice->RenderCheckerboard(Vec3f(0.666f, 0.666f, 0.666f), Vec3f(0.333f, 0.333f, 0.333f));
m_pDevice->FlipOutputWindow(m_PixelContext.outputID);
return;
}
m_pDevice->ClearOutputWindowColour(m_PixelContext.outputID, color);
TextureDisplay disp = m_RenderData.texDisplay;
disp.rawoutput = false;
renderdocui/Windows/TextureViewer.cs
+2 -5
View File
@@ -2315,12 +2315,9 @@ namespace renderdocui.Windows
private void pixelContext_Paint(object sender, PaintEventArgs e)
{
if (m_Output == null || m_Core.Renderer == null || PixelPicked == false)
if (m_Output == null || m_Core.Renderer == null)
{
if (backcolorPick.Checked)
e.Graphics.Clear(colorDialog.Color);
else
DrawCheckerboard(e.Graphics, pixelContext.DisplayRectangle);
DrawCheckerboard(e.Graphics, pixelContext.DisplayRectangle);
return;
}