lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-06 01:50:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use viewport for guessing aspect ratio, not dimensions of depth/colour

Browse Source
This commit is contained in:
baldurk
2015-11-27 15:05:42 +01:00
parent 101d780956
commit bd5a6752e2
2 changed files with 60 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdocui/Code/CommonPipelineState.cs
+59
View File
@@ -61,6 +61,11 @@ namespace renderdocui.Code
public bool Used;
};
public struct Viewport
{
public float x, y, width, height;
};
public class CommonPipelineState
{
private D3D11PipelineState m_D3D11 = null;
@@ -150,6 +155,24 @@ namespace renderdocui.Code
}
}
// whether or not the PostVS data is aligned in the typical fashion
// ie. vectors not crossing float4 boundaries). APIs that use stream-out
// or transform feedback have tightly packed data, but APIs that rewrite
// shaders to dump data might have these alignment requirements
public bool HasAlignedPostVSData
{
get
{
if (LogLoaded)
{
if (IsLogVK)
return true;
}
return false;
}
}
public string Abbrev(ShaderStageType stage)
{
if (IsLogD3D11 || (!LogLoaded && DefaultType == APIPipelineStateType.D3D11))
@@ -194,6 +217,42 @@ namespace renderdocui.Code
// there's a lot of redundancy in these functions
public Viewport GetViewport(int index)
{
Viewport ret = new Viewport();
// default to a 1x1 viewport just to avoid having to check for 0s all over
ret.x = ret.y = 0.0f;
ret.width = ret.height = 1.0f;
if (LogLoaded)
{
if (IsLogD3D11 && m_D3D11.m_RS.Viewports.Length > 0)
{
ret.x = m_D3D11.m_RS.Viewports[0].TopLeft[0];
ret.y = m_D3D11.m_RS.Viewports[0].TopLeft[1];
ret.width = m_D3D11.m_RS.Viewports[0].Width;
ret.height = m_D3D11.m_RS.Viewports[0].Height;
}
else if (IsLogGL && m_GL.m_RS.Viewports.Length > 0)
{
ret.x = m_GL.m_RS.Viewports[0].Left;
ret.y = m_GL.m_RS.Viewports[0].Bottom;
ret.width = m_GL.m_RS.Viewports[0].Width;
ret.height = m_GL.m_RS.Viewports[0].Height;
}
else if (IsLogVK && m_Vulkan.VP.viewportScissors.Length > 0)
{
ret.x = m_Vulkan.VP.viewportScissors[0].vp.x;
ret.y = m_Vulkan.VP.viewportScissors[0].vp.y;
ret.width = m_Vulkan.VP.viewportScissors[0].vp.Width;
ret.height = m_Vulkan.VP.viewportScissors[0].vp.Height;
}
}
return ret;
}
public ShaderBindpointMapping GetBindpointMapping(ShaderStageType stage)
{
if (LogLoaded)
renderdocui/Windows/BufferViewer.cs
+1 -19
View File
@@ -2698,25 +2698,7 @@ namespace renderdocui.Windows
m_MeshDisplay.aspect = 1.0f;
// take a guess for the aspect ratio, for if the user hasn't overridden it
BoundResource depth = m_Core.CurPipelineState.GetDepthTarget();
BoundResource[] targets = m_Core.CurPipelineState.GetOutputTargets();
if (depth.Id != ResourceId.Null || (targets != null && targets.Length > 0))
{
foreach (var t in m_Core.CurTextures)
{
if (depth.Id != ResourceId.Null && t.ID == depth.Id)
{
m_MeshDisplay.aspect = (float)t.width / (float)t.height;
break;
}
if (depth.Id == ResourceId.Null && targets != null && targets.Length > 0 && t.ID == targets[0].Id)
{
m_MeshDisplay.aspect = (float)t.width / (float)t.height;
break;
}
}
}
m_MeshDisplay.aspect = m_Core.CurPipelineState.GetViewport(0).width / m_Core.CurPipelineState.GetViewport(0).height;
if (aspectGuess.Text.Length > 0 && float.TryParse(aspectGuess.Text, out m_MeshDisplay.aspect))
aspectGuess.Text = m_MeshDisplay.aspect.ToString("G");