From: Pyry Haulos <phaulos@google.com>
Date: Mon, 13 Jul 2015 19:55:52 +0000 (-0700)
Subject: Fix Vulkan disp (non-GPU) handle types
X-Git-Tag: upstream/0.1.0~812^2~629^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d2f56b84ee3d4e0528e2d4a16415af7c78c80bdf;p=platform%2Fupstream%2FVK-GL-CTS.git

Fix Vulkan disp (non-GPU) handle types

Change-Id: I90222900e060d1aae8a086d95dd88636f39a14c8
---

diff --git a/external/vulkancts/framework/vulkan/vkDefs.cpp b/external/vulkancts/framework/vulkan/vkDefs.cpp
index 88a0af5..e5c179c 100644
--- a/external/vulkancts/framework/vulkan/vkDefs.cpp
+++ b/external/vulkancts/framework/vulkan/vkDefs.cpp
@@ -39,7 +39,8 @@
 
 DE_STATIC_ASSERT(sizeof(vk::VkImageType)	== sizeof(deUint32));
 DE_STATIC_ASSERT(sizeof(vk::VkResult)		== sizeof(deUint32));
-DE_STATIC_ASSERT(sizeof(vk::VkDevice)		== sizeof(deUint64));
+DE_STATIC_ASSERT(sizeof(vk::VkDevice)		== sizeof(void*));
+DE_STATIC_ASSERT(sizeof(vk::VkBuffer)		== sizeof(deUint64));
 
 namespace vk
 {
diff --git a/external/vulkancts/framework/vulkan/vkDefs.hpp b/external/vulkancts/framework/vulkan/vkDefs.hpp
index e53db48..d487848 100644
--- a/external/vulkancts/framework/vulkan/vkDefs.hpp
+++ b/external/vulkancts/framework/vulkan/vkDefs.hpp
@@ -52,8 +52,8 @@
 #	define VK_APIENTRY
 #endif
 
-#define VK_DEFINE_HANDLE(NAME, TYPE)			typedef Handle<TYPE> NAME
-#define VK_DEFINE_NONDISP_HANDLE(NAME, TYPE)	VK_DEFINE_HANDLE(NAME, TYPE)
+#define VK_DEFINE_HANDLE(NAME, TYPE)			typedef struct NAME##_s* NAME
+#define VK_DEFINE_NONDISP_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)