From b8520a274df9885bb67dfa3dae9a590f2e331404 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Tue, 18 Oct 2016 19:35:01 +0200
Subject: [PATCH] Fix compile errors on CI targets

---
 renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp  | 8 ++++----
 renderdoc/driver/d3d12/d3d12_command_queue_wrap.cpp | 6 +++---
 renderdoc/driver/d3d12/d3d12_device.cpp             | 4 ++--
 renderdoc/replay/replay_renderer.cpp                | 4 ++++
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp b/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp
index 3bdb0e1ef..f3a63b04d 100644
--- a/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp
+++ b/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp
@@ -2772,12 +2772,12 @@ bool WrappedID3D12GraphicsCommandList::Serialise_ClearDepthStencilView(
 
       m_Cmd->AddDrawcall(draw, true);
 
-      D3D12Descriptor *desc = DescriptorFromPortableHandle(GetResourceManager(), dsv);
+      D3D12Descriptor *descriptor = DescriptorFromPortableHandle(GetResourceManager(), dsv);
 
       D3D12DrawcallTreeNode &drawNode = m_Cmd->GetDrawcallStack().back()->children.back();
 
       drawNode.resourceUsage.push_back(std::make_pair(
-          GetResID(desc->nonsamp.resource), EventUsage(drawNode.draw.eventID, eUsage_Clear)));
+          GetResID(descriptor->nonsamp.resource), EventUsage(drawNode.draw.eventID, eUsage_Clear)));
     }
   }
 
@@ -2857,12 +2857,12 @@ bool WrappedID3D12GraphicsCommandList::Serialise_ClearRenderTargetView(
 
       m_Cmd->AddDrawcall(draw, true);
 
-      D3D12Descriptor *desc = DescriptorFromPortableHandle(GetResourceManager(), rtv);
+      D3D12Descriptor *descriptor = DescriptorFromPortableHandle(GetResourceManager(), rtv);
 
       D3D12DrawcallTreeNode &drawNode = m_Cmd->GetDrawcallStack().back()->children.back();
 
       drawNode.resourceUsage.push_back(std::make_pair(
-          GetResID(desc->nonsamp.resource), EventUsage(drawNode.draw.eventID, eUsage_Clear)));
+          GetResID(descriptor->nonsamp.resource), EventUsage(drawNode.draw.eventID, eUsage_Clear)));
     }
   }
 
diff --git a/renderdoc/driver/d3d12/d3d12_command_queue_wrap.cpp b/renderdoc/driver/d3d12/d3d12_command_queue_wrap.cpp
index c885dcd96..5fb44fd8c 100644
--- a/renderdoc/driver/d3d12/d3d12_command_queue_wrap.cpp
+++ b/renderdoc/driver/d3d12/d3d12_command_queue_wrap.cpp
@@ -95,14 +95,14 @@ bool WrappedID3D12CommandQueue::Serialise_ExecuteCommandLists(UINT NumCommandLis
     {
       ScopedContext msgscope(m_pSerialiser, "DebugMessage", "DebugMessage", 0, false);
 
-      string desc;
+      string msgDesc;
       if(m_State >= WRITING)
-        desc = debugMessages[i].description.elems;
+        msgDesc = debugMessages[i].description.elems;
 
       SERIALISE_ELEMENT(uint32_t, Category, debugMessages[i].category);
       SERIALISE_ELEMENT(uint32_t, Severity, debugMessages[i].severity);
       SERIALISE_ELEMENT(uint32_t, ID, debugMessages[i].messageID);
-      SERIALISE_ELEMENT(string, Description, desc);
+      SERIALISE_ELEMENT(string, Description, msgDesc);
 
       if(m_State == READING)
       {
diff --git a/renderdoc/driver/d3d12/d3d12_device.cpp b/renderdoc/driver/d3d12/d3d12_device.cpp
index f94f1159b..54acac5f3 100644
--- a/renderdoc/driver/d3d12/d3d12_device.cpp
+++ b/renderdoc/driver/d3d12/d3d12_device.cpp
@@ -767,9 +767,9 @@ bool WrappedID3D12Device::Serialise_MapDataWrite(Serialiser *localSerialiser,
   {
     ID3D12Resource *r = GetResourceManager()->GetLiveAs<ID3D12Resource>(res);
 
-    D3D12_RANGE range = {};
+    range.Begin = range.End = 0;
 
-    byte *mapPtr = NULL;
+    mapPtr = NULL;
     HRESULT hr = r->Map(sub, &range, (void **)&mapPtr);
 
     if(SUCCEEDED(hr))
diff --git a/renderdoc/replay/replay_renderer.cpp b/renderdoc/replay/replay_renderer.cpp
index 190319602..de1c4d562 100644
--- a/renderdoc/replay/replay_renderer.cpp
+++ b/renderdoc/replay/replay_renderer.cpp
@@ -1268,16 +1268,19 @@ bool ReplayRenderer::PixelHistory(ResourceId target, uint32_t x, uint32_t y, uin
       case eUsage_GS_Constants:
       case eUsage_PS_Constants:
       case eUsage_CS_Constants:
+      case eUsage_All_Constants:
       case eUsage_VS_Resource:
       case eUsage_HS_Resource:
       case eUsage_DS_Resource:
       case eUsage_GS_Resource:
       case eUsage_PS_Resource:
       case eUsage_CS_Resource:
+      case eUsage_All_Resource:
       case eUsage_InputTarget:
       case eUsage_CopySrc:
       case eUsage_ResolveSrc:
       case eUsage_Barrier:
+      case eUsage_Indirect:
         // read-only, not a valid pixel history event
         continue;
 
@@ -1289,6 +1292,7 @@ bool ReplayRenderer::PixelHistory(ResourceId target, uint32_t x, uint32_t y, uin
       case eUsage_GS_RWResource:
       case eUsage_PS_RWResource:
       case eUsage_CS_RWResource:
+      case eUsage_All_RWResource:
       case eUsage_ColourTarget:
       case eUsage_DepthStencilTarget:
       case eUsage_Clear: