From 514967ccd2fa09456ae8aafe97afe9a98364c8a7 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Thu, 31 Dec 2015 17:47:36 +0100
Subject: [PATCH] Win32 compile fixes (and some replay proxy fixups)

---
 renderdoc/core/replay_proxy.cpp      | 18 +++++++++++++++---
 renderdoc/driver/vulkan/vk_core.cpp  |  4 ++--
 renderdoc/driver/vulkan/vk_debug.cpp |  2 +-
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/renderdoc/core/replay_proxy.cpp b/renderdoc/core/replay_proxy.cpp
index 0db60f207..e20bd6958 100644
--- a/renderdoc/core/replay_proxy.cpp
+++ b/renderdoc/core/replay_proxy.cpp
@@ -738,7 +738,7 @@ void Serialiser::Serialise(const char *name, VulkanPipelineState::VertexInput::A
 	Serialise("", el.format);
 	Serialise("", el.byteoffset);
 
-	SIZE_CHECK(VulkanPipelineState::VertexInput::Attribute, 48);
+	SIZE_CHECK(VulkanPipelineState::VertexInput::Attribute, 52);
 }
 
 template<>
@@ -751,6 +751,15 @@ void Serialiser::Serialise(const char *name, VulkanPipelineState::VertexInput &e
 	SIZE_CHECK(VulkanPipelineState::VertexInput, 24);
 }
 
+template<>
+void Serialiser::Serialise(const char *name, VulkanPipelineState::ShaderStage::SpecInfo &el)
+{
+	Serialise("", el.specID);
+	Serialise("", el.data);
+
+	SIZE_CHECK(VulkanPipelineState::ShaderStage::SpecInfo, 12);
+}
+
 template<>
 void Serialiser::Serialise(const char *name, VulkanPipelineState::ShaderStage &el)
 {
@@ -764,8 +773,10 @@ void Serialiser::Serialise(const char *name, VulkanPipelineState::ShaderStage &e
 
 	if(m_Mode == READING)
 		el.ShaderDetails = NULL;
+	
+	Serialise("", el.specialization);
 
-	SIZE_CHECK(VulkanPipelineState::ShaderStage, 72);
+	SIZE_CHECK(VulkanPipelineState::ShaderStage, 80);
 }
 
 template<>
@@ -885,7 +896,7 @@ void Serialiser::Serialise(const char *name, VulkanPipelineState &el)
 	Serialise("", el.DS);
 	Serialise("", el.Pass);
 
-	SIZE_CHECK(VulkanPipelineState, 840);
+	SIZE_CHECK(VulkanPipelineState, 888);
 }
 
 #pragma endregion Vulkan pipeline state
@@ -1037,6 +1048,7 @@ void Serialiser::Serialise(const char *name, MeshFormat &el)
 	Serialise("", el.compCount);
 	Serialise("", el.compByteWidth);
 	Serialise("", el.compType);
+	Serialise("", el.bgraOrder);
 	Serialise("", el.specialFormat);
 	Serialise("", el.showAlpha);
 	Serialise("", el.topo);
diff --git a/renderdoc/driver/vulkan/vk_core.cpp b/renderdoc/driver/vulkan/vk_core.cpp
index 4cda4cefa..d6ee5f30c 100644
--- a/renderdoc/driver/vulkan/vk_core.cpp
+++ b/renderdoc/driver/vulkan/vk_core.cpp
@@ -1974,7 +1974,7 @@ void WrappedVulkan::AddDrawcall(FetchDrawcall d, bool hasEvents)
 
 			RDCASSERT(colAtt.size() < 8);
 			
-			for(int i=0; i < 8 && i < colAtt.size(); i++)
+			for(int i=0; i < 8 && i < (int)colAtt.size(); i++)
 			{
 				RDCASSERT(colAtt[i] < atts.size());
 				draw.outputs[i] = atts[ colAtt[i] ].view;
@@ -1982,7 +1982,7 @@ void WrappedVulkan::AddDrawcall(FetchDrawcall d, bool hasEvents)
 
 			if(dsAtt != -1)
 			{
-				RDCASSERT(dsAtt < atts.size());
+				RDCASSERT(dsAtt < (int32_t)atts.size());
 				draw.depthOut = atts[dsAtt].view;
 			}
 		}
diff --git a/renderdoc/driver/vulkan/vk_debug.cpp b/renderdoc/driver/vulkan/vk_debug.cpp
index 3231fc371..8e9bf713b 100644
--- a/renderdoc/driver/vulkan/vk_debug.cpp
+++ b/renderdoc/driver/vulkan/vk_debug.cpp
@@ -1477,7 +1477,7 @@ VulkanDebugManager::~VulkanDebugManager()
 	GetResourceManager()->ReleaseWrappedResource(m_TextDescSet);
 	GetResourceManager()->ReleaseWrappedResource(m_MeshDescSet);
 	GetResourceManager()->ReleaseWrappedResource(m_OutlineDescSet);
-	if(m_QuadDescSet)
+	if(m_QuadDescSet != VK_NULL_HANDLE)
 	{
 		GetResourceManager()->ReleaseWrappedResource(m_MeshFetchDescSet);
 		GetResourceManager()->ReleaseWrappedResource(m_QuadDescSet);