From 8262bd277028bef16fcab20cf4d572384fa4cc98 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Tue, 4 Apr 2017 21:12:58 +0100
Subject: [PATCH] Refactor viewport to have X/Y separate members instead of
 TopLeft[2]

---
 qrenderdoc/Code/CommonPipelineState.cpp       |  8 ++++----
 .../D3D11PipelineStateViewer.cpp              |  3 +--
 .../D3D12PipelineStateViewer.cpp              |  3 +--
 renderdoc/api/replay/d3d11_pipestate.h        | 18 +++++++++---------
 renderdoc/api/replay/d3d12_pipestate.h        | 19 ++++++++-----------
 5 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/qrenderdoc/Code/CommonPipelineState.cpp b/qrenderdoc/Code/CommonPipelineState.cpp
index 6535a5eff..431c3784e 100644
--- a/qrenderdoc/Code/CommonPipelineState.cpp
+++ b/qrenderdoc/Code/CommonPipelineState.cpp
@@ -119,15 +119,15 @@ Viewport CommonPipelineState::GetViewport(int index)
   {
     if(IsLogD3D11() && index < m_D3D11->m_RS.Viewports.count)
     {
-      ret.x = m_D3D11->m_RS.Viewports[index].TopLeft[0];
-      ret.y = m_D3D11->m_RS.Viewports[index].TopLeft[1];
+      ret.x = m_D3D11->m_RS.Viewports[index].X;
+      ret.y = m_D3D11->m_RS.Viewports[index].Y;
       ret.width = m_D3D11->m_RS.Viewports[index].Width;
       ret.height = m_D3D11->m_RS.Viewports[index].Height;
     }
     else if(IsLogD3D12() && index < m_D3D12->m_RS.Viewports.count)
     {
-      ret.x = m_D3D12->m_RS.Viewports[index].TopLeft[0];
-      ret.y = m_D3D12->m_RS.Viewports[index].TopLeft[1];
+      ret.x = m_D3D12->m_RS.Viewports[index].X;
+      ret.y = m_D3D12->m_RS.Viewports[index].Y;
       ret.width = m_D3D12->m_RS.Viewports[index].Width;
       ret.height = m_D3D12->m_RS.Viewports[index].Height;
     }
diff --git a/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp
index ac504b149..0aa15fd9e 100644
--- a/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp
+++ b/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp
@@ -1456,8 +1456,7 @@ void D3D11PipelineStateViewer::setState()
 
     if(v.Enabled || ui->showEmpty->isChecked())
     {
-      QTreeWidgetItem *node =
-          makeTreeNode({i, v.TopLeft[0], v.TopLeft[1], v.Width, v.Height, v.MinDepth, v.MaxDepth});
+      QTreeWidgetItem *node = makeTreeNode({i, v.X, v.Y, v.Width, v.Height, v.MinDepth, v.MaxDepth});
 
       if(v.Width == 0 || v.Height == 0 || v.MinDepth == v.MaxDepth)
         setEmptyRow(node);
diff --git a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp
index dc38ead44..432ed87af 100644
--- a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp
+++ b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp
@@ -1473,8 +1473,7 @@ void D3D12PipelineStateViewer::setState()
   {
     const D3D12Pipe::Viewport &v = state.m_RS.Viewports[i];
 
-    QTreeWidgetItem *node =
-        makeTreeNode({i, v.TopLeft[0], v.TopLeft[1], v.Width, v.Height, v.MinDepth, v.MaxDepth});
+    QTreeWidgetItem *node = makeTreeNode({i, v.X, v.Y, v.Width, v.Height, v.MinDepth, v.MaxDepth});
 
     if(v.Width == 0 || v.Height == 0 || v.MinDepth == v.MaxDepth)
       setEmptyRow(node);
diff --git a/renderdoc/api/replay/d3d11_pipestate.h b/renderdoc/api/replay/d3d11_pipestate.h
index c7e2d4203..ec5a6a9f7 100644
--- a/renderdoc/api/replay/d3d11_pipestate.h
+++ b/renderdoc/api/replay/d3d11_pipestate.h
@@ -191,20 +191,20 @@ struct SO
 
 struct Viewport
 {
-  Viewport() : Width(0.0f), Height(0.0f), MinDepth(0.0f), MaxDepth(0.0f), Enabled(false)
+  Viewport()
+      : X(0.0f), Y(0.0f), Width(0.0f), Height(0.0f), MinDepth(0.0f), MaxDepth(0.0f), Enabled(false)
   {
-    TopLeft[0] = 0.0f;
-    TopLeft[1] = 0.0f;
   }
   Viewport(float TX, float TY, float W, float H, float MN, float MX, bool en)
-      : Width(W), Height(H), MinDepth(MN), MaxDepth(MX), Enabled(en)
+      : X(TX), Y(TY), Width(W), Height(H), MinDepth(MN), MaxDepth(MX), Enabled(en)
   {
-    TopLeft[0] = TX;
-    TopLeft[1] = TY;
   }
-  float TopLeft[2];
-  float Width, Height;
-  float MinDepth, MaxDepth;
+  float X;
+  float Y;
+  float Width;
+  float Height;
+  float MinDepth;
+  float MaxDepth;
   bool32 Enabled;
 };
 
diff --git a/renderdoc/api/replay/d3d12_pipestate.h b/renderdoc/api/replay/d3d12_pipestate.h
index 3a2c3a803..7e841f08b 100644
--- a/renderdoc/api/replay/d3d12_pipestate.h
+++ b/renderdoc/api/replay/d3d12_pipestate.h
@@ -220,20 +220,17 @@ struct Streamout
 
 struct Viewport
 {
-  Viewport() : Width(0.0f), Height(0.0f), MinDepth(0.0f), MaxDepth(0.0f)
-  {
-    TopLeft[0] = 0.0f;
-    TopLeft[1] = 0.0f;
-  }
+  Viewport() : X(0.0f), Y(0.0f), Width(0.0f), Height(0.0f), MinDepth(0.0f), MaxDepth(0.0f) {}
   Viewport(float TX, float TY, float W, float H, float MN, float MX)
-      : Width(W), Height(H), MinDepth(MN), MaxDepth(MX)
+      : X(TX), Y(TY), Width(W), Height(H), MinDepth(MN), MaxDepth(MX)
   {
-    TopLeft[0] = TX;
-    TopLeft[1] = TY;
   }
-  float TopLeft[2];
-  float Width, Height;
-  float MinDepth, MaxDepth;
+  float X;
+  float Y;
+  float Width;
+  float Height;
+  float MinDepth;
+  float MaxDepth;
 };
 
 struct Scissor