From b86389d3ca3222c125598a5ced775c05ffad2c90 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Thu, 14 Jan 2016 19:40:19 +0100
Subject: [PATCH] Standardise on uint32_t for width/height storage, cast to
 int32_t

---
 renderdoc/driver/vulkan/vk_debug.cpp  |  4 ++--
 renderdoc/driver/vulkan/vk_debug.h    |  6 +++---
 renderdoc/driver/vulkan/vk_replay.cpp | 10 +++++-----
 renderdoc/driver/vulkan/vk_replay.h   |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/renderdoc/driver/vulkan/vk_debug.cpp b/renderdoc/driver/vulkan/vk_debug.cpp
index f048dc7bd..3e40a092f 100644
--- a/renderdoc/driver/vulkan/vk_debug.cpp
+++ b/renderdoc/driver/vulkan/vk_debug.cpp
@@ -1032,7 +1032,7 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev)
 	RDCASSERT(vkr == VK_SUCCESS);
 
 	{
-		int width = FONT_TEX_WIDTH, height = FONT_TEX_HEIGHT;
+		uint32_t width = FONT_TEX_WIDTH, height = FONT_TEX_HEIGHT;
 
 		VkImageCreateInfo imInfo = {
 			VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO, NULL, 0,
@@ -1137,7 +1137,7 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev)
 
 			RDCASSERT(pData != NULL);
 
-			for(int32_t row = 0; row < height; row++)
+			for(uint32_t row = 0; row < height; row++)
 			{
 				memcpy(pData, buf, width);
 				pData += layout.rowPitch;
diff --git a/renderdoc/driver/vulkan/vk_debug.h b/renderdoc/driver/vulkan/vk_debug.h
index 564d41dc8..b76a76924 100644
--- a/renderdoc/driver/vulkan/vk_debug.h
+++ b/renderdoc/driver/vulkan/vk_debug.h
@@ -35,7 +35,7 @@ struct TextPrintState
 	VkCommandBuffer cmd;
 	VkRenderPass rp;
 	VkFramebuffer fb;
-	int32_t w, h;
+	uint32_t w, h;
 };
 
 struct MeshDisplayPipelines
@@ -255,8 +255,8 @@ class VulkanDebugManager
 		void PatchFixedColShader(VkShaderModule &mod, float col[4]);
 		
 		void RenderTextInternal(const TextPrintState &textstate, float x, float y, const char *text);
-		static const int FONT_TEX_WIDTH = 256;
-		static const int FONT_TEX_HEIGHT = 128;
+		static const uint32_t FONT_TEX_WIDTH = 256;
+		static const uint32_t FONT_TEX_HEIGHT = 128;
 
 		LogState m_State;
 
diff --git a/renderdoc/driver/vulkan/vk_replay.cpp b/renderdoc/driver/vulkan/vk_replay.cpp
index 6258de7cb..b7631f93c 100644
--- a/renderdoc/driver/vulkan/vk_replay.cpp
+++ b/renderdoc/driver/vulkan/vk_replay.cpp
@@ -1352,15 +1352,15 @@ void VulkanReplay::RenderHighlightBox(float w, float h, float scale)
 			{ 1.0f, 1.0f, 1.0f, 1.0f }
 		};
 
-		int32_t sz = int32_t(scale);
+		uint32_t sz = uint32_t(scale);
 
 		VkOffset2D tl = { int32_t(w/2.0f + 0.5f), int32_t(h/2.0f + 0.5f) };
 
 		VkClearRect rect[4] = {
-			{ { { tl.x, tl.y },    { 1, sz }, }, 0, 1 },
-			{ { { tl.x+sz, tl.y }, { 1, sz+1 }, }, 0, 1 },
-			{ { { tl.x, tl.y },    { sz, 1 }, }, 0, 1 },
-			{ { { tl.x, tl.y+sz }, { sz, 1 }, }, 0, 1 },
+			{ { { tl.x            , tl.y    }, { 1, sz }, }, 0, 1 },
+			{ { { tl.x+(int32_t)sz, tl.y    }, { 1, sz+1 }, }, 0, 1 },
+			{ { { tl.x            , tl.y    }, { sz, 1 }, }, 0, 1 },
+			{ { { tl.x            , tl.y+(int32_t)sz }, { sz, 1 }, }, 0, 1 },
 		};
 
 		// inner
diff --git a/renderdoc/driver/vulkan/vk_replay.h b/renderdoc/driver/vulkan/vk_replay.h
index a8018aaf8..ec2dd7a0e 100644
--- a/renderdoc/driver/vulkan/vk_replay.h
+++ b/renderdoc/driver/vulkan/vk_replay.h
@@ -195,7 +195,7 @@ class VulkanReplay : public IReplayDriver
 
 			WINDOW_HANDLE_DECL
 
-			int32_t width, height;
+			uint32_t width, height;
 
 			VkSurfaceKHR surface;
 			VkSwapchainKHR swap;
@@ -227,7 +227,7 @@ class VulkanReplay : public IReplayDriver
 		uint64_t m_OutputWinID;
 		uint64_t m_ActiveWinID;
 		bool m_BindDepth;
-		int m_DebugWidth, m_DebugHeight;
+		uint32_t m_DebugWidth, m_DebugHeight;
 		
 		// simple cache for when we need buffer data for highlighting
 		// vertices, typical use will be lots of vertices in the same