Windows build fix. Use deUint types
authorBoris Zanin <boris.zanin@mobica.com>
Tue, 11 Jul 2017 12:31:58 +0000 (14:31 +0200)
committerAlexander Galazin <Alexander.Galazin@arm.com>
Tue, 11 Jul 2017 13:30:42 +0000 (09:30 -0400)
uint32_t and uint64_t have been replaced with
deUint32 and deUint64 recognizable by Windows.

Components: Vulkan

VK-GL-CTS issue: 358

Change-Id: I5b80d861a63005011f3d0b663d802f97321148f8

external/vulkancts/modules/vulkan/synchronization/vktSynchronizationWin32KeyedMutexTests.cpp

index e5e98a8..d5ce79e 100644 (file)
@@ -1156,8 +1156,8 @@ private:
 
        ResourceDescription                     m_resourceDesc;
 
-       uint64_t                                        m_sharedMemSize;
-       uint64_t                                        m_sharedMemOffset;
+       deUint64                                        m_sharedMemSize;
+       deUint64                                        m_sharedMemOffset;
        HANDLE                                          m_sharedMemHandle[BUFFER_COUNT];
        bool                                            m_isMemNtHandle;
 
@@ -1585,9 +1585,9 @@ tcu::TestStatus Win32KeyedMutexTestInstance::iterate (void)
 
                {
                        vk::VkDeviceMemory                                                      memory                  = resourceWrite->getMemory();
-                       uint64_t                                                                        keyInit                 = DX11Operation::KEYED_MUTEX_VK_WRITE;
-                       uint32_t                                                                        timeout                 = 0xFFFFFFFF; // INFINITE
-                       uint64_t                                                                        keyExternal             = DX11Operation::KEYED_MUTEX_DX_COPY;
+                       deUint64                                                                        keyInit                 = DX11Operation::KEYED_MUTEX_VK_WRITE;
+                       deUint32                                                                        timeout                 = 0xFFFFFFFF; // INFINITE
+                       deUint64                                                                        keyExternal             = DX11Operation::KEYED_MUTEX_DX_COPY;
                        vk::VkWin32KeyedMutexAcquireReleaseInfoKHR      keyedMutexInfo  =
                        {
                                vk::VK_STRUCTURE_TYPE_WIN32_KEYED_MUTEX_ACQUIRE_RELEASE_INFO_KHR,
@@ -1626,9 +1626,9 @@ tcu::TestStatus Win32KeyedMutexTestInstance::iterate (void)
 
                {
                        vk::VkDeviceMemory                                                      memory                  = resourceRead->getMemory();
-                       uint64_t                                                                        keyInternal             = DX11Operation::KEYED_MUTEX_VK_VERIFY;
-                       uint32_t                                                                        timeout                 = 0xFFFFFFFF; // INFINITE
-                       uint64_t                                                                        keyExternal             = DX11Operation::KEYED_MUTEX_DONE;
+                       deUint64                                                                        keyInternal             = DX11Operation::KEYED_MUTEX_VK_VERIFY;
+                       deUint32                                                                        timeout                 = 0xFFFFFFFF; // INFINITE
+                       deUint64                                                                        keyExternal             = DX11Operation::KEYED_MUTEX_DONE;
                        vk::VkWin32KeyedMutexAcquireReleaseInfoKHR      keyedMutexInfo  =
                        {
                                vk::VK_STRUCTURE_TYPE_WIN32_KEYED_MUTEX_ACQUIRE_RELEASE_INFO_KHR,