From 9dfcf7826bea38094645db2e460391a7952d459d Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Thu, 17 Sep 2015 18:32:25 +0200
Subject: [PATCH] Fix 32-bit build

---
 renderdoc/driver/vulkan/renderdoc_vulkan.vcxproj |  1 +
 renderdoc/driver/vulkan/vk_common.cpp            | 14 +++++++-------
 renderdoc/driver/vulkan/vk_core.h                |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/renderdoc/driver/vulkan/renderdoc_vulkan.vcxproj b/renderdoc/driver/vulkan/renderdoc_vulkan.vcxproj
index a6ed135ce..5dcb87505 100644
--- a/renderdoc/driver/vulkan/renderdoc_vulkan.vcxproj
+++ b/renderdoc/driver/vulkan/renderdoc_vulkan.vcxproj
@@ -30,6 +30,7 @@
     </ClCompile>
     <ClCompile Include="vk_hooks_win32.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="vk_info.cpp" />
     <ClCompile Include="vk_manager.cpp" />
diff --git a/renderdoc/driver/vulkan/vk_common.cpp b/renderdoc/driver/vulkan/vk_common.cpp
index 69ee9a6e0..f867b46ae 100644
--- a/renderdoc/driver/vulkan/vk_common.cpp
+++ b/renderdoc/driver/vulkan/vk_common.cpp
@@ -2588,7 +2588,7 @@ void Serialiser::Serialise(const char *name, VkSpecializationMapEntry &el)
 	Serialise("constantId", el.constantId);
 	uint64_t size = el.size;
 	Serialise("size", size);
-	if(m_Mode == READING) el.size = size;
+	if(m_Mode == READING) el.size = (size_t)size;
 	Serialise("offset", el.offset);
 }
 
@@ -2599,7 +2599,7 @@ void Serialiser::Serialise(const char *name, VkSpecializationInfo &el)
 
 	uint64_t dataSize = el.dataSize;
 	Serialise("dataSize", el.dataSize);
-	size_t sz = dataSize;
+	size_t sz = (size_t)dataSize;
 	if(m_Mode == READING) el.pData = NULL;
 	SerialiseBuffer("pData", (byte *&)el.pData, sz);
 
@@ -2617,15 +2617,15 @@ void Serialiser::Serialise(const char *name, VkPipelineCacheCreateInfo &el)
 
 	uint64_t initialSize = el.initialSize;
 	Serialise("codeSize", initialSize);
-	el.initialSize = initialSize;
+	el.initialSize = (size_t)initialSize;
 
-	size_t sz = initialSize;
+	size_t sz = (size_t)initialSize;
 	if(m_Mode == READING) el.initialData = NULL;
 	SerialiseBuffer("initialData", (byte *&)el.initialData, sz);
 
 	uint64_t maxSize = el.maxSize;
 	Serialise("maxSize", maxSize);
-	el.maxSize = maxSize;
+	el.maxSize = (size_t)maxSize;
 }
 
 template<>
@@ -2663,9 +2663,9 @@ void Serialiser::Serialise(const char *name, VkShaderModuleCreateInfo &el)
 
 	uint64_t codeSize = el.codeSize;
 	Serialise("codeSize", codeSize);
-	el.codeSize = codeSize;
+	el.codeSize = (size_t)codeSize;
 
-	size_t sz = codeSize;
+	size_t sz = (size_t)codeSize;
 	if(m_Mode == READING) el.pCode = NULL;
 	SerialiseBuffer("pCode", (byte *&)el.pCode, sz);
 	// VKTODOLOW if this enum gets any bits, cast to Vk*FlagBits
diff --git a/renderdoc/driver/vulkan/vk_core.h b/renderdoc/driver/vulkan/vk_core.h
index 19cd20436..428876642 100644
--- a/renderdoc/driver/vulkan/vk_core.h
+++ b/renderdoc/driver/vulkan/vk_core.h
@@ -432,7 +432,7 @@ private:
 				const char*         pLayerPrefix,
 				const char*         pMsg);
 	
-	static void VKAPI DebugCallbackStatic(
+	static void DebugCallbackStatic(
 				VkFlags             msgFlags,
 				VkDbgObjectType     objType,
 				uint64_t            srcObject,