From 97aa6281ace3739b5c45c4be49227312094cd72d Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Wed, 25 Jan 2017 21:04:57 +0000
Subject: [PATCH] Compile fixes for linux

---
 qrenderdoc/Windows/BufferViewer.cpp           |  7 ++++---
 .../D3D11PipelineStateViewer.cpp              |  6 +++---
 .../D3D12PipelineStateViewer.cpp              | 19 ++++++++++---------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/qrenderdoc/Windows/BufferViewer.cpp b/qrenderdoc/Windows/BufferViewer.cpp
index 3bca6cc6f..bbbc0ceb1 100644
--- a/qrenderdoc/Windows/BufferViewer.cpp
+++ b/qrenderdoc/Windows/BufferViewer.cpp
@@ -31,6 +31,7 @@
 class CameraWrapper
 {
 public:
+  virtual ~CameraWrapper() {}
   virtual bool Update(QRect winSize) = 0;
   virtual Camera *camera() = 0;
 
@@ -116,7 +117,7 @@ class ArcballWrapper : public CameraWrapper
 {
 public:
   ArcballWrapper() { m_Cam = Camera_InitArcball(); }
-  ~ArcballWrapper() { Camera_Shutdown(m_Cam); }
+  virtual ~ArcballWrapper() { Camera_Shutdown(m_Cam); }
   Camera *camera() override { return m_Cam; }
   void Reset(FloatVector pos, float dist)
   {
@@ -223,7 +224,7 @@ class FlycamWrapper : public CameraWrapper
 {
 public:
   FlycamWrapper() { m_Cam = Camera_InitFPSLook(); }
-  ~FlycamWrapper() { Camera_Shutdown(m_Cam); }
+  virtual ~FlycamWrapper() { Camera_Shutdown(m_Cam); }
   Camera *camera() override { return m_Cam; }
   void Reset(FloatVector pos)
   {
@@ -651,7 +652,7 @@ void BufferViewer::OnEventChanged(uint32_t eventID)
       qMax(m_ModelVSIn->componentWidth, Formatter::Format(123456.7890123456789).length());
 
   m_ModelVSOut->componentWidth = m_ModelVSIn->componentWidth;
-  // m_ModelGSOut->componentWidth = m_ModelVSIn->componentWidth;
+  m_ModelGSOut->componentWidth = m_ModelVSIn->componentWidth;
 
   QVector<VertexInputAttribute> vinputs = m_Ctx->CurPipelineState.GetVertexInputs();
 
diff --git a/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp
index a616ce872..4764ec73b 100644
--- a/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp
+++ b/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp
@@ -889,7 +889,7 @@ void D3D11PipelineStateViewer::setShaderState(const D3D11PipelineState::ShaderSt
       if(s.UseBorder)
         addressing += QString("<%1>").arg(borderColor);
 
-      QString filter = s.Filter;
+      QString filter = ToQStr(s.Filter);
 
       if(s.MaxAniso > 1)
         filter += QString(" %1x").arg(s.MaxAniso);
@@ -1324,7 +1324,7 @@ void D3D11PipelineStateViewer::setState()
     if(showNode(usedSlot, filledSlot))
     {
       QString name = "Buffer " + ToQStr(v.Buffer);
-      uint64_t length = 1;
+      qulonglong length = 1;
 
       if(!filledSlot)
       {
@@ -1417,7 +1417,7 @@ void D3D11PipelineStateViewer::setState()
     if(showNode(usedSlot, filledSlot))
     {
       QString name = "Buffer " + ToQStr(s.Buffer);
-      uint64_t length = 0;
+      qulonglong length = 0;
 
       if(!filledSlot)
       {
diff --git a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp
index 51167f699..db1f7793e 100644
--- a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp
+++ b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp
@@ -1008,7 +1008,7 @@ void D3D12PipelineStateViewer::setShaderState(const D3D12PipelineState::ShaderSt
         if(s.UseBorder)
           addressing += QString("<%1>").arg(borderColor);
 
-        QString filter = s.Filter;
+        QString filter = ToQStr(s.Filter);
 
         if(s.MaxAniso > 1)
           filter += QString(" %1x").arg(s.MaxAniso);
@@ -1131,8 +1131,8 @@ void D3D12PipelineStateViewer::setShaderState(const D3D12PipelineState::ShaderSt
         if(length < bytesize)
           filledSlot = false;
 
-        QTreeWidgetItem *node =
-            makeTreeNode({rootel, (uint64_t)space, regname, name, offset, sizestr, ""});
+        QTreeWidgetItem *node = makeTreeNode(
+            {rootel, (qulonglong)space, regname, name, (qulonglong)offset, sizestr, ""});
 
         node->setData(0, Qt::UserRole, tag);
 
@@ -1316,8 +1316,9 @@ void D3D12PipelineStateViewer::setState()
         length = buf->length;
       }
 
-      QTreeWidgetItem *node = makeTreeNode({"Index", name, draw ? draw->indexByteWidth : 0,
-                                            state.m_IA.ibuffer.Offset, (qulonglong)length, ""});
+      QTreeWidgetItem *node =
+          makeTreeNode({"Index", name, draw ? draw->indexByteWidth : 0,
+                        (qulonglong)state.m_IA.ibuffer.Offset, (qulonglong)length, ""});
 
       ui->iaBuffers->setHoverIcons(node, action, action_hover);
 
@@ -1365,7 +1366,7 @@ void D3D12PipelineStateViewer::setState()
     if(showNode(usedSlot, filledSlot))
     {
       QString name = "Buffer " + ToQStr(v.Buffer);
-      uint64_t length = 1;
+      qulonglong length = 1;
 
       if(!filledSlot)
       {
@@ -1383,7 +1384,7 @@ void D3D12PipelineStateViewer::setState()
       QTreeWidgetItem *node = NULL;
 
       if(filledSlot)
-        node = makeTreeNode({i, name, v.Stride, v.Offset, length, ""});
+        node = makeTreeNode({i, name, v.Stride, (qulonglong)v.Offset, length, ""});
       else
         node = makeTreeNode({i, "No Buffer Set", "-", "-", "-", ""});
 
@@ -1433,7 +1434,7 @@ void D3D12PipelineStateViewer::setState()
     if(showNode(usedSlot, filledSlot))
     {
       QString name = "Buffer " + ToQStr(s.Buffer);
-      uint64_t length = 0;
+      qulonglong length = 0;
 
       if(!filledSlot)
       {
@@ -1449,7 +1450,7 @@ void D3D12PipelineStateViewer::setState()
           length = buf->length;
       }
 
-      QTreeWidgetItem *node = makeTreeNode({i, name, length, s.Offset, ""});
+      QTreeWidgetItem *node = makeTreeNode({i, name, length, (qulonglong)s.Offset, ""});
 
       ui->gsStreamOut->setHoverIcons(node, action, action_hover);