From c8cdc4078364690f98162291d7fb3d7114bb72cc Mon Sep 17 00:00:00 2001
From: Pyry Haulos <phaulos@google.com>
Date: Thu, 7 Apr 2016 17:10:27 -0700
Subject: [PATCH] Improve VK_MAKE_VERSION and VK_BIT macros

VK_MAKE_VERSION was causing int->uint conversion warnings.

Put arguments inside parenthesis to make evaluation unambiguous.

Change-Id: Ia47efdf77789905f4c45a551c08eb0ff3496c556
(cherry picked from commit dd99172aee72493b3e508dc8990e7eac95a40f8f)
---
 external/vulkancts/framework/vulkan/vkDefs.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/external/vulkancts/framework/vulkan/vkDefs.hpp b/external/vulkancts/framework/vulkan/vkDefs.hpp
index 7b5d8c0..87726f1 100644
--- a/external/vulkancts/framework/vulkan/vkDefs.hpp
+++ b/external/vulkancts/framework/vulkan/vkDefs.hpp
@@ -40,8 +40,8 @@
 #define VK_DEFINE_HANDLE(NAME, TYPE)					typedef struct NAME##_s* NAME
 #define VK_DEFINE_NON_DISPATCHABLE_HANDLE(NAME, TYPE)	typedef Handle<TYPE> NAME
 
-#define VK_MAKE_VERSION(MAJOR, MINOR, PATCH)	((MAJOR << 22) | (MINOR << 12) | PATCH)
-#define VK_BIT(NUM)								(1<<NUM)
+#define VK_MAKE_VERSION(MAJOR, MINOR, PATCH)	(((deUint32)(MAJOR) << 22u) | ((deUint32)(MINOR) << 12u) | (deUint32)(PATCH))
+#define VK_BIT(NUM)								(1u<<(deUint32)(NUM))
 
 #define VK_CHECK(EXPR)							vk::checkResult((EXPR), #EXPR, __FILE__, __LINE__)
 #define VK_CHECK_MSG(EXPR, MSG)					vk::checkResult((EXPR), MSG, __FILE__, __LINE__)
-- 
2.7.4