Replace DWORD with uint32_t

This change replaces DWORD with uint32_t instead of deUint32

Components: Vulkan

Affects: dEQP-VK.api.*create_win32*

VK-GL-CTS issue: 2963

Change-Id: I32e958863508e4641f769feebd450c25bfc95492

diff --git a/external/vulkancts/framework/vulkan/vkStructTypes.inl b/external/vulkancts/framework/vulkan/vkStructTypes.inl
index 883882b..920cfad 100644 (file)
--- a/external/vulkancts/framework/vulkan/vkStructTypes.inl
+++ b/external/vulkancts/framework/vulkan/vkStructTypes.inl
@@ -6794,7 +6794,7 @@ struct VkExportMemoryWin32HandleInfoKHR
        VkStructureType                                 sType;
        const void*                                             pNext;
        pt::Win32SecurityAttributesPtr  pAttributes;
-       deUint32                                                dwAccess;
+       uint32_t                                                dwAccess;
        pt::Win32LPCWSTR                                name;
 };
 
@@ -6842,7 +6842,7 @@ struct VkExportSemaphoreWin32HandleInfoKHR
        VkStructureType                                 sType;
        const void*                                             pNext;
        pt::Win32SecurityAttributesPtr  pAttributes;
-       deUint32                                                dwAccess;
+       uint32_t                                                dwAccess;
        pt::Win32LPCWSTR                                name;
 };
 
@@ -6880,7 +6880,7 @@ struct VkExportFenceWin32HandleInfoKHR
        VkStructureType                                 sType;
        const void*                                             pNext;
        pt::Win32SecurityAttributesPtr  pAttributes;
-       deUint32                                                dwAccess;
+       uint32_t                                                dwAccess;
        pt::Win32LPCWSTR                                name;
 };
 
@@ -6905,7 +6905,7 @@ struct VkExportMemoryWin32HandleInfoNV
        VkStructureType                                 sType;
        const void*                                             pNext;
        pt::Win32SecurityAttributesPtr  pAttributes;
-       deUint32                                                dwAccess;
+       uint32_t                                                dwAccess;
 };
 
 struct VkWin32KeyedMutexAcquireReleaseInfoNV

diff --git a/external/vulkancts/scripts/gen_framework.py b/external/vulkancts/scripts/gen_framework.py
index f021136..a6e17da 100755 (executable)
--- a/external/vulkancts/scripts/gen_framework.py
+++ b/external/vulkancts/scripts/gen_framework.py
@@ -109,7 +109,7 @@ TYPE_SUBSTITUTIONS          = [
        ("bool32_t",    "deUint32"),
 
        # Platform-specific
-       ("DWORD",               "deUint32"),
+       ("DWORD",               "uint32_t"),
        ("HANDLE*",             PLATFORM_TYPE_NAMESPACE + "::" + "Win32Handle*"),
 ]