Use [u]int32_t in the framework
authorAlexander Galazin <alexander.galazin@arm.com>
Thu, 8 Jul 2021 07:39:25 +0000 (09:39 +0200)
committerAlexander Galazin <Alexander.Galazin@arm.com>
Thu, 15 Jul 2021 10:52:13 +0000 (10:52 +0000)
This change replaces deUint32/deInt32 with uint32_t/int32_t
in the framework files

Components: Vulkan

Affects: dEQP-VK.*

VK-GL-CTS issue: 2963

Change-Id: I05be456ba7f1e6bf33990b971e56e21d2123b8e8

21 files changed:
external/vulkancts/framework/vulkan/vkBasicTypes.inl
external/vulkancts/framework/vulkan/vkConcreteDeviceInterface.inl
external/vulkancts/framework/vulkan/vkConcreteInstanceInterface.inl
external/vulkancts/framework/vulkan/vkConcretePlatformInterface.inl
external/vulkancts/framework/vulkan/vkCoreFunctionalities.inl
external/vulkancts/framework/vulkan/vkDeviceDriverImpl.inl
external/vulkancts/framework/vulkan/vkExtensionFunctions.inl
external/vulkancts/framework/vulkan/vkFunctionPointerTypes.inl
external/vulkancts/framework/vulkan/vkInstanceDriverImpl.inl
external/vulkancts/framework/vulkan/vkKnownDriverIds.inl
external/vulkancts/framework/vulkan/vkNullDriverImpl.inl
external/vulkancts/framework/vulkan/vkPlatformDriverImpl.inl
external/vulkancts/framework/vulkan/vkRefUtil.inl
external/vulkancts/framework/vulkan/vkRefUtilImpl.inl
external/vulkancts/framework/vulkan/vkStructTypes.inl
external/vulkancts/framework/vulkan/vkSupportedExtensions.inl
external/vulkancts/framework/vulkan/vkTypeUtil.inl
external/vulkancts/framework/vulkan/vkVirtualDeviceInterface.inl
external/vulkancts/framework/vulkan/vkVirtualInstanceInterface.inl
external/vulkancts/framework/vulkan/vkVirtualPlatformInterface.inl
external/vulkancts/scripts/gen_framework.py

index df9ca77..8474ad8 100644 (file)
@@ -1,9 +1,9 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  */
-#define VK_API_VERSION_1_0                                     (static_cast<deUint32>                  (VK_MAKE_API_VERSION(0, 1, 0, 0)))
-#define VK_API_VERSION_1_1                                     (static_cast<deUint32>                  (VK_MAKE_API_VERSION(0, 1, 1, 0)))
-#define VK_API_VERSION_1_2                                     (static_cast<deUint32>                  (VK_MAKE_API_VERSION(0, 1, 2, 0)))
+#define VK_API_VERSION_1_0                                     (static_cast<uint32_t>                  (VK_MAKE_API_VERSION(0, 1, 0, 0)))
+#define VK_API_VERSION_1_1                                     (static_cast<uint32_t>                  (VK_MAKE_API_VERSION(0, 1, 1, 0)))
+#define VK_API_VERSION_1_2                                     (static_cast<uint32_t>                  (VK_MAKE_API_VERSION(0, 1, 2, 0)))
 #define VK_MAX_PHYSICAL_DEVICE_NAME_SIZE       (static_cast<size_t>                    (256U))
 #define VK_MAX_EXTENSION_NAME_SIZE                     (static_cast<size_t>                    (256U))
 #define VK_MAX_DRIVER_NAME_SIZE                                (static_cast<size_t>                    (256U))
 #define VK_MAX_MEMORY_HEAPS                                    (static_cast<size_t>                    (16U))
 #define VK_MAX_DESCRIPTION_SIZE                                (static_cast<size_t>                    (256U))
 #define VK_MAX_DEVICE_GROUP_SIZE                       (static_cast<size_t>                    (32U))
-#define VK_ATTACHMENT_UNUSED                           (static_cast<deUint32>                  ((~0U)))
-#define VK_SUBPASS_EXTERNAL                                    (static_cast<deUint32>                  ((~0U)))
-#define VK_QUEUE_FAMILY_IGNORED                                (static_cast<deUint32>                  ((~0U)))
-#define VK_QUEUE_FAMILY_EXTERNAL                       (static_cast<deUint32>                  ((~1U)))
-#define VK_REMAINING_MIP_LEVELS                                (static_cast<deUint32>                  ((~0U)))
-#define VK_REMAINING_ARRAY_LAYERS                      (static_cast<deUint32>                  ((~0U)))
+#define VK_ATTACHMENT_UNUSED                           (static_cast<uint32_t>                  ((~0U)))
+#define VK_SUBPASS_EXTERNAL                                    (static_cast<uint32_t>                  ((~0U)))
+#define VK_QUEUE_FAMILY_IGNORED                                (static_cast<uint32_t>                  ((~0U)))
+#define VK_QUEUE_FAMILY_EXTERNAL                       (static_cast<uint32_t>                  ((~1U)))
+#define VK_REMAINING_MIP_LEVELS                                (static_cast<uint32_t>                  ((~0U)))
+#define VK_REMAINING_ARRAY_LAYERS                      (static_cast<uint32_t>                  ((~0U)))
 #define VK_WHOLE_SIZE                                          (static_cast<vk::VkDeviceSize>  ((~0ULL)))
 #define VK_TRUE                                                                (static_cast<vk::VkBool32>              (1U))
 #define VK_FALSE                                                       (static_cast<vk::VkBool32>              (0U))
@@ -2601,7 +2601,7 @@ enum VkAccessFlagBits
        VK_ACCESS_ACCELERATION_STRUCTURE_WRITE_BIT_NV                   = VK_ACCESS_ACCELERATION_STRUCTURE_WRITE_BIT_KHR,
        VK_ACCESS_FLAG_BITS_MAX_ENUM                                                    = 0x7FFFFFFF,
 };
-typedef deUint32 VkAccessFlags;
+typedef uint32_t VkAccessFlags;
 
 enum VkImageAspectFlagBits
 {
@@ -2621,7 +2621,7 @@ enum VkImageAspectFlagBits
        VK_IMAGE_ASPECT_PLANE_2_BIT_KHR                 = VK_IMAGE_ASPECT_PLANE_2_BIT,
        VK_IMAGE_ASPECT_FLAG_BITS_MAX_ENUM              = 0x7FFFFFFF,
 };
-typedef deUint32 VkImageAspectFlags;
+typedef uint32_t VkImageAspectFlags;
 
 enum VkFormatFeatureFlagBits
 {
@@ -2669,7 +2669,7 @@ enum VkFormatFeatureFlagBits
        VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_CUBIC_BIT_EXT                                                                                            = VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_CUBIC_BIT_IMG,
        VK_FORMAT_FEATURE_FLAG_BITS_MAX_ENUM                                                                                                                            = 0x7FFFFFFF,
 };
-typedef deUint32 VkFormatFeatureFlags;
+typedef uint32_t VkFormatFeatureFlags;
 
 enum VkImageCreateFlagBits
 {
@@ -2696,7 +2696,7 @@ enum VkImageCreateFlagBits
        VK_IMAGE_CREATE_ALIAS_BIT_KHR                                                           = VK_IMAGE_CREATE_ALIAS_BIT,
        VK_IMAGE_CREATE_FLAG_BITS_MAX_ENUM                                                      = 0x7FFFFFFF,
 };
-typedef deUint32 VkImageCreateFlags;
+typedef uint32_t VkImageCreateFlags;
 
 enum VkSampleCountFlagBits
 {
@@ -2709,7 +2709,7 @@ enum VkSampleCountFlagBits
        VK_SAMPLE_COUNT_64_BIT                          = 0x00000040,
        VK_SAMPLE_COUNT_FLAG_BITS_MAX_ENUM      = 0x7FFFFFFF,
 };
-typedef deUint32 VkSampleCountFlags;
+typedef uint32_t VkSampleCountFlags;
 
 enum VkImageUsageFlagBits
 {
@@ -2732,7 +2732,7 @@ enum VkImageUsageFlagBits
        VK_IMAGE_USAGE_SHADING_RATE_IMAGE_BIT_NV                                = VK_IMAGE_USAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR,
        VK_IMAGE_USAGE_FLAG_BITS_MAX_ENUM                                               = 0x7FFFFFFF,
 };
-typedef deUint32 VkImageUsageFlags;
+typedef uint32_t VkImageUsageFlags;
 
 enum VkMemoryHeapFlagBits
 {
@@ -2741,7 +2741,7 @@ enum VkMemoryHeapFlagBits
        VK_MEMORY_HEAP_MULTI_INSTANCE_BIT_KHR   = VK_MEMORY_HEAP_MULTI_INSTANCE_BIT,
        VK_MEMORY_HEAP_FLAG_BITS_MAX_ENUM               = 0x7FFFFFFF,
 };
-typedef deUint32 VkMemoryHeapFlags;
+typedef uint32_t VkMemoryHeapFlags;
 
 enum VkMemoryPropertyFlagBits
 {
@@ -2756,7 +2756,7 @@ enum VkMemoryPropertyFlagBits
        VK_MEMORY_PROPERTY_RDMA_CAPABLE_BIT_NV          = 0x00000100,
        VK_MEMORY_PROPERTY_FLAG_BITS_MAX_ENUM           = 0x7FFFFFFF,
 };
-typedef deUint32 VkMemoryPropertyFlags;
+typedef uint32_t VkMemoryPropertyFlags;
 
 enum VkQueueFlagBits
 {
@@ -2769,14 +2769,14 @@ enum VkQueueFlagBits
        VK_QUEUE_VIDEO_ENCODE_BIT_KHR   = 0x00000040,
        VK_QUEUE_FLAG_BITS_MAX_ENUM             = 0x7FFFFFFF,
 };
-typedef deUint32 VkQueueFlags;
+typedef uint32_t VkQueueFlags;
 
 enum VkDeviceQueueCreateFlagBits
 {
        VK_DEVICE_QUEUE_CREATE_PROTECTED_BIT            = 0x00000001,
        VK_DEVICE_QUEUE_CREATE_FLAG_BITS_MAX_ENUM       = 0x7FFFFFFF,
 };
-typedef deUint32 VkDeviceQueueCreateFlags;
+typedef uint32_t VkDeviceQueueCreateFlags;
 
 enum VkPipelineStageFlagBits
 {
@@ -2812,14 +2812,14 @@ enum VkPipelineStageFlagBits
        VK_PIPELINE_STAGE_ACCELERATION_STRUCTURE_BUILD_BIT_NV           = VK_PIPELINE_STAGE_ACCELERATION_STRUCTURE_BUILD_BIT_KHR,
        VK_PIPELINE_STAGE_FLAG_BITS_MAX_ENUM                                            = 0x7FFFFFFF,
 };
-typedef deUint32 VkPipelineStageFlags;
+typedef uint32_t VkPipelineStageFlags;
 
 enum VkSparseMemoryBindFlagBits
 {
        VK_SPARSE_MEMORY_BIND_METADATA_BIT                      = 0x00000001,
        VK_SPARSE_MEMORY_BIND_FLAG_BITS_MAX_ENUM        = 0x7FFFFFFF,
 };
-typedef deUint32 VkSparseMemoryBindFlags;
+typedef uint32_t VkSparseMemoryBindFlags;
 
 enum VkSparseImageFormatFlagBits
 {
@@ -2828,21 +2828,21 @@ enum VkSparseImageFormatFlagBits
        VK_SPARSE_IMAGE_FORMAT_NONSTANDARD_BLOCK_SIZE_BIT       = 0x00000004,
        VK_SPARSE_IMAGE_FORMAT_FLAG_BITS_MAX_ENUM                       = 0x7FFFFFFF,
 };
-typedef deUint32 VkSparseImageFormatFlags;
+typedef uint32_t VkSparseImageFormatFlags;
 
 enum VkFenceCreateFlagBits
 {
        VK_FENCE_CREATE_SIGNALED_BIT            = 0x00000001,
        VK_FENCE_CREATE_FLAG_BITS_MAX_ENUM      = 0x7FFFFFFF,
 };
-typedef deUint32 VkFenceCreateFlags;
+typedef uint32_t VkFenceCreateFlags;
 
 enum VkEventCreateFlagBits
 {
        VK_EVENT_CREATE_DEVICE_ONLY_BIT_KHR     = 0x00000001,
        VK_EVENT_CREATE_FLAG_BITS_MAX_ENUM      = 0x7FFFFFFF,
 };
-typedef deUint32 VkEventCreateFlags;
+typedef uint32_t VkEventCreateFlags;
 
 enum VkQueryPipelineStatisticFlagBits
 {
@@ -2859,7 +2859,7 @@ enum VkQueryPipelineStatisticFlagBits
        VK_QUERY_PIPELINE_STATISTIC_COMPUTE_SHADER_INVOCATIONS_BIT                                      = 0x00000400,
        VK_QUERY_PIPELINE_STATISTIC_FLAG_BITS_MAX_ENUM                                                          = 0x7FFFFFFF,
 };
-typedef deUint32 VkQueryPipelineStatisticFlags;
+typedef uint32_t VkQueryPipelineStatisticFlags;
 
 enum VkQueryResultFlagBits
 {
@@ -2870,7 +2870,7 @@ enum VkQueryResultFlagBits
        VK_QUERY_RESULT_WITH_STATUS_BIT_KHR             = 0x00000010,
        VK_QUERY_RESULT_FLAG_BITS_MAX_ENUM              = 0x7FFFFFFF,
 };
-typedef deUint32 VkQueryResultFlags;
+typedef uint32_t VkQueryResultFlags;
 
 enum VkBufferCreateFlagBits
 {
@@ -2883,7 +2883,7 @@ enum VkBufferCreateFlagBits
        VK_BUFFER_CREATE_DEVICE_ADDRESS_CAPTURE_REPLAY_BIT_KHR  = VK_BUFFER_CREATE_DEVICE_ADDRESS_CAPTURE_REPLAY_BIT,
        VK_BUFFER_CREATE_FLAG_BITS_MAX_ENUM                                             = 0x7FFFFFFF,
 };
-typedef deUint32 VkBufferCreateFlags;
+typedef uint32_t VkBufferCreateFlags;
 
 enum VkBufferUsageFlagBits
 {
@@ -2912,7 +2912,7 @@ enum VkBufferUsageFlagBits
        VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT_KHR                                                   = VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT,
        VK_BUFFER_USAGE_FLAG_BITS_MAX_ENUM                                                                              = 0x7FFFFFFF,
 };
-typedef deUint32 VkBufferUsageFlags;
+typedef uint32_t VkBufferUsageFlags;
 
 enum VkImageViewCreateFlagBits
 {
@@ -2920,20 +2920,20 @@ enum VkImageViewCreateFlagBits
        VK_IMAGE_VIEW_CREATE_FRAGMENT_DENSITY_MAP_DEFERRED_BIT_EXT      = 0x00000002,
        VK_IMAGE_VIEW_CREATE_FLAG_BITS_MAX_ENUM                                         = 0x7FFFFFFF,
 };
-typedef deUint32 VkImageViewCreateFlags;
+typedef uint32_t VkImageViewCreateFlags;
 
 enum VkShaderModuleCreateFlagBits
 {
        VK_SHADER_MODULE_CREATE_FLAG_BITS_MAX_ENUM      = 0x7FFFFFFF,
 };
-typedef deUint32 VkShaderModuleCreateFlags;
+typedef uint32_t VkShaderModuleCreateFlags;
 
 enum VkPipelineCacheCreateFlagBits
 {
        VK_PIPELINE_CACHE_CREATE_EXTERNALLY_SYNCHRONIZED_BIT_EXT        = 0x00000001,
        VK_PIPELINE_CACHE_CREATE_FLAG_BITS_MAX_ENUM                                     = 0x7FFFFFFF,
 };
-typedef deUint32 VkPipelineCacheCreateFlags;
+typedef uint32_t VkPipelineCacheCreateFlags;
 
 enum VkColorComponentFlagBits
 {
@@ -2943,7 +2943,7 @@ enum VkColorComponentFlagBits
        VK_COLOR_COMPONENT_A_BIT                                = 0x00000008,
        VK_COLOR_COMPONENT_FLAG_BITS_MAX_ENUM   = 0x7FFFFFFF,
 };
-typedef deUint32 VkColorComponentFlags;
+typedef uint32_t VkColorComponentFlags;
 
 enum VkPipelineCreateFlagBits
 {
@@ -2972,7 +2972,7 @@ enum VkPipelineCreateFlagBits
        VK_PIPELINE_CREATE_DISPATCH_BASE_KHR                                                                            = VK_PIPELINE_CREATE_DISPATCH_BASE,
        VK_PIPELINE_CREATE_FLAG_BITS_MAX_ENUM                                                                           = 0x7FFFFFFF,
 };
-typedef deUint32 VkPipelineCreateFlags;
+typedef uint32_t VkPipelineCreateFlags;
 
 enum VkPipelineShaderStageCreateFlagBits
 {
@@ -2980,7 +2980,7 @@ enum VkPipelineShaderStageCreateFlagBits
        VK_PIPELINE_SHADER_STAGE_CREATE_REQUIRE_FULL_SUBGROUPS_BIT_EXT          = 0x00000002,
        VK_PIPELINE_SHADER_STAGE_CREATE_FLAG_BITS_MAX_ENUM                                      = 0x7FFFFFFF,
 };
-typedef deUint32 VkPipelineShaderStageCreateFlags;
+typedef uint32_t VkPipelineShaderStageCreateFlags;
 
 enum VkShaderStageFlagBits
 {
@@ -3009,7 +3009,7 @@ enum VkShaderStageFlagBits
        VK_SHADER_STAGE_CALLABLE_BIT_NV                         = VK_SHADER_STAGE_CALLABLE_BIT_KHR,
        VK_SHADER_STAGE_FLAG_BITS_MAX_ENUM                      = 0x7FFFFFFF,
 };
-typedef deUint32 VkShaderStageFlags;
+typedef uint32_t VkShaderStageFlags;
 
 enum VkCullModeFlagBits
 {
@@ -3019,7 +3019,7 @@ enum VkCullModeFlagBits
        VK_CULL_MODE_FRONT_AND_BACK             = 0x00000003,
        VK_CULL_MODE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF,
 };
-typedef deUint32 VkCullModeFlags;
+typedef uint32_t VkCullModeFlags;
 
 enum VkSamplerCreateFlagBits
 {
@@ -3027,7 +3027,7 @@ enum VkSamplerCreateFlagBits
        VK_SAMPLER_CREATE_SUBSAMPLED_COARSE_RECONSTRUCTION_BIT_EXT      = 0x00000002,
        VK_SAMPLER_CREATE_FLAG_BITS_MAX_ENUM                                            = 0x7FFFFFFF,
 };
-typedef deUint32 VkSamplerCreateFlags;
+typedef uint32_t VkSamplerCreateFlags;
 
 enum VkDescriptorPoolCreateFlagBits
 {
@@ -3037,7 +3037,7 @@ enum VkDescriptorPoolCreateFlagBits
        VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT_EXT     = VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT,
        VK_DESCRIPTOR_POOL_CREATE_FLAG_BITS_MAX_ENUM            = 0x7FFFFFFF,
 };
-typedef deUint32 VkDescriptorPoolCreateFlags;
+typedef uint32_t VkDescriptorPoolCreateFlags;
 
 enum VkDescriptorSetLayoutCreateFlagBits
 {
@@ -3047,14 +3047,14 @@ enum VkDescriptorSetLayoutCreateFlagBits
        VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT  = VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT,
        VK_DESCRIPTOR_SET_LAYOUT_CREATE_FLAG_BITS_MAX_ENUM                              = 0x7FFFFFFF,
 };
-typedef deUint32 VkDescriptorSetLayoutCreateFlags;
+typedef uint32_t VkDescriptorSetLayoutCreateFlags;
 
 enum VkAttachmentDescriptionFlagBits
 {
        VK_ATTACHMENT_DESCRIPTION_MAY_ALIAS_BIT                 = 0x00000001,
        VK_ATTACHMENT_DESCRIPTION_FLAG_BITS_MAX_ENUM    = 0x7FFFFFFF,
 };
-typedef deUint32 VkAttachmentDescriptionFlags;
+typedef uint32_t VkAttachmentDescriptionFlags;
 
 enum VkDependencyFlagBits
 {
@@ -3065,7 +3065,7 @@ enum VkDependencyFlagBits
        VK_DEPENDENCY_DEVICE_GROUP_BIT_KHR      = VK_DEPENDENCY_DEVICE_GROUP_BIT,
        VK_DEPENDENCY_FLAG_BITS_MAX_ENUM        = 0x7FFFFFFF,
 };
-typedef deUint32 VkDependencyFlags;
+typedef uint32_t VkDependencyFlags;
 
 enum VkFramebufferCreateFlagBits
 {
@@ -3073,14 +3073,14 @@ enum VkFramebufferCreateFlagBits
        VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT_KHR         = VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT,
        VK_FRAMEBUFFER_CREATE_FLAG_BITS_MAX_ENUM        = 0x7FFFFFFF,
 };
-typedef deUint32 VkFramebufferCreateFlags;
+typedef uint32_t VkFramebufferCreateFlags;
 
 enum VkRenderPassCreateFlagBits
 {
        VK_RENDER_PASS_CREATE_TRANSFORM_BIT_QCOM        = 0x00000002,
        VK_RENDER_PASS_CREATE_FLAG_BITS_MAX_ENUM        = 0x7FFFFFFF,
 };
-typedef deUint32 VkRenderPassCreateFlags;
+typedef uint32_t VkRenderPassCreateFlags;
 
 enum VkSubpassDescriptionFlagBits
 {
@@ -3090,7 +3090,7 @@ enum VkSubpassDescriptionFlagBits
        VK_SUBPASS_DESCRIPTION_SHADER_RESOLVE_BIT_QCOM                  = 0x00000008,
        VK_SUBPASS_DESCRIPTION_FLAG_BITS_MAX_ENUM                               = 0x7FFFFFFF,
 };
-typedef deUint32 VkSubpassDescriptionFlags;
+typedef uint32_t VkSubpassDescriptionFlags;
 
 enum VkCommandPoolCreateFlagBits
 {
@@ -3099,14 +3099,14 @@ enum VkCommandPoolCreateFlagBits
        VK_COMMAND_POOL_CREATE_PROTECTED_BIT                    = 0x00000004,
        VK_COMMAND_POOL_CREATE_FLAG_BITS_MAX_ENUM               = 0x7FFFFFFF,
 };
-typedef deUint32 VkCommandPoolCreateFlags;
+typedef uint32_t VkCommandPoolCreateFlags;
 
 enum VkCommandPoolResetFlagBits
 {
        VK_COMMAND_POOL_RESET_RELEASE_RESOURCES_BIT     = 0x00000001,
        VK_COMMAND_POOL_RESET_FLAG_BITS_MAX_ENUM        = 0x7FFFFFFF,
 };
-typedef deUint32 VkCommandPoolResetFlags;
+typedef uint32_t VkCommandPoolResetFlags;
 
 enum VkCommandBufferUsageFlagBits
 {
@@ -3115,21 +3115,21 @@ enum VkCommandBufferUsageFlagBits
        VK_COMMAND_BUFFER_USAGE_SIMULTANEOUS_USE_BIT            = 0x00000004,
        VK_COMMAND_BUFFER_USAGE_FLAG_BITS_MAX_ENUM                      = 0x7FFFFFFF,
 };
-typedef deUint32 VkCommandBufferUsageFlags;
+typedef uint32_t VkCommandBufferUsageFlags;
 
 enum VkQueryControlFlagBits
 {
        VK_QUERY_CONTROL_PRECISE_BIT            = 0x00000001,
        VK_QUERY_CONTROL_FLAG_BITS_MAX_ENUM     = 0x7FFFFFFF,
 };
-typedef deUint32 VkQueryControlFlags;
+typedef uint32_t VkQueryControlFlags;
 
 enum VkCommandBufferResetFlagBits
 {
        VK_COMMAND_BUFFER_RESET_RELEASE_RESOURCES_BIT   = 0x00000001,
        VK_COMMAND_BUFFER_RESET_FLAG_BITS_MAX_ENUM              = 0x7FFFFFFF,
 };
-typedef deUint32 VkCommandBufferResetFlags;
+typedef uint32_t VkCommandBufferResetFlags;
 
 enum VkStencilFaceFlagBits
 {
@@ -3139,7 +3139,7 @@ enum VkStencilFaceFlagBits
        VK_STENCIL_FRONT_AND_BACK                       = VK_STENCIL_FACE_FRONT_AND_BACK,
        VK_STENCIL_FACE_FLAG_BITS_MAX_ENUM      = 0x7FFFFFFF,
 };
-typedef deUint32 VkStencilFaceFlags;
+typedef uint32_t VkStencilFaceFlags;
 
 enum VkSubgroupFeatureFlagBits
 {
@@ -3154,7 +3154,7 @@ enum VkSubgroupFeatureFlagBits
        VK_SUBGROUP_FEATURE_PARTITIONED_BIT_NV          = 0x00000100,
        VK_SUBGROUP_FEATURE_FLAG_BITS_MAX_ENUM          = 0x7FFFFFFF,
 };
-typedef deUint32 VkSubgroupFeatureFlags;
+typedef uint32_t VkSubgroupFeatureFlags;
 
 enum VkPeerMemoryFeatureFlagBits
 {
@@ -3168,7 +3168,7 @@ enum VkPeerMemoryFeatureFlagBits
        VK_PEER_MEMORY_FEATURE_GENERIC_DST_BIT_KHR      = VK_PEER_MEMORY_FEATURE_GENERIC_DST_BIT,
        VK_PEER_MEMORY_FEATURE_FLAG_BITS_MAX_ENUM       = 0x7FFFFFFF,
 };
-typedef deUint32 VkPeerMemoryFeatureFlags;
+typedef uint32_t VkPeerMemoryFeatureFlags;
 
 enum VkMemoryAllocateFlagBits
 {
@@ -3180,7 +3180,7 @@ enum VkMemoryAllocateFlagBits
        VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_CAPTURE_REPLAY_BIT_KHR        = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_CAPTURE_REPLAY_BIT,
        VK_MEMORY_ALLOCATE_FLAG_BITS_MAX_ENUM                                           = 0x7FFFFFFF,
 };
-typedef deUint32 VkMemoryAllocateFlags;
+typedef uint32_t VkMemoryAllocateFlags;
 
 enum VkExternalMemoryHandleTypeFlagBits
 {
@@ -3206,7 +3206,7 @@ enum VkExternalMemoryHandleTypeFlagBits
        VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D12_RESOURCE_BIT_KHR                           = VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D12_RESOURCE_BIT,
        VK_EXTERNAL_MEMORY_HANDLE_TYPE_FLAG_BITS_MAX_ENUM                                       = 0x7FFFFFFF,
 };
-typedef deUint32 VkExternalMemoryHandleTypeFlags;
+typedef uint32_t VkExternalMemoryHandleTypeFlags;
 
 enum VkExternalMemoryFeatureFlagBits
 {
@@ -3218,7 +3218,7 @@ enum VkExternalMemoryFeatureFlagBits
        VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT_KHR           = VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT,
        VK_EXTERNAL_MEMORY_FEATURE_FLAG_BITS_MAX_ENUM           = 0x7FFFFFFF,
 };
-typedef deUint32 VkExternalMemoryFeatureFlags;
+typedef uint32_t VkExternalMemoryFeatureFlags;
 
 enum VkExternalFenceHandleTypeFlagBits
 {
@@ -3232,7 +3232,7 @@ enum VkExternalFenceHandleTypeFlagBits
        VK_EXTERNAL_FENCE_HANDLE_TYPE_SYNC_FD_BIT_KHR                   = VK_EXTERNAL_FENCE_HANDLE_TYPE_SYNC_FD_BIT,
        VK_EXTERNAL_FENCE_HANDLE_TYPE_FLAG_BITS_MAX_ENUM                = 0x7FFFFFFF,
 };
-typedef deUint32 VkExternalFenceHandleTypeFlags;
+typedef uint32_t VkExternalFenceHandleTypeFlags;
 
 enum VkExternalFenceFeatureFlagBits
 {
@@ -3242,7 +3242,7 @@ enum VkExternalFenceFeatureFlagBits
        VK_EXTERNAL_FENCE_FEATURE_IMPORTABLE_BIT_KHR    = VK_EXTERNAL_FENCE_FEATURE_IMPORTABLE_BIT,
        VK_EXTERNAL_FENCE_FEATURE_FLAG_BITS_MAX_ENUM    = 0x7FFFFFFF,
 };
-typedef deUint32 VkExternalFenceFeatureFlags;
+typedef uint32_t VkExternalFenceFeatureFlags;
 
 enum VkFenceImportFlagBits
 {
@@ -3250,7 +3250,7 @@ enum VkFenceImportFlagBits
        VK_FENCE_IMPORT_TEMPORARY_BIT_KHR       = VK_FENCE_IMPORT_TEMPORARY_BIT,
        VK_FENCE_IMPORT_FLAG_BITS_MAX_ENUM      = 0x7FFFFFFF,
 };
-typedef deUint32 VkFenceImportFlags;
+typedef uint32_t VkFenceImportFlags;
 
 enum VkSemaphoreImportFlagBits
 {
@@ -3258,7 +3258,7 @@ enum VkSemaphoreImportFlagBits
        VK_SEMAPHORE_IMPORT_TEMPORARY_BIT_KHR   = VK_SEMAPHORE_IMPORT_TEMPORARY_BIT,
        VK_SEMAPHORE_IMPORT_FLAG_BITS_MAX_ENUM  = 0x7FFFFFFF,
 };
-typedef deUint32 VkSemaphoreImportFlags;
+typedef uint32_t VkSemaphoreImportFlags;
 
 enum VkExternalSemaphoreHandleTypeFlagBits
 {
@@ -3276,7 +3276,7 @@ enum VkExternalSemaphoreHandleTypeFlagBits
        VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT_KHR                       = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT,
        VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_FLAG_BITS_MAX_ENUM            = 0x7FFFFFFF,
 };
-typedef deUint32 VkExternalSemaphoreHandleTypeFlags;
+typedef uint32_t VkExternalSemaphoreHandleTypeFlags;
 
 enum VkExternalSemaphoreFeatureFlagBits
 {
@@ -3286,7 +3286,7 @@ enum VkExternalSemaphoreFeatureFlagBits
        VK_EXTERNAL_SEMAPHORE_FEATURE_IMPORTABLE_BIT_KHR        = VK_EXTERNAL_SEMAPHORE_FEATURE_IMPORTABLE_BIT,
        VK_EXTERNAL_SEMAPHORE_FEATURE_FLAG_BITS_MAX_ENUM        = 0x7FFFFFFF,
 };
-typedef deUint32 VkExternalSemaphoreFeatureFlags;
+typedef uint32_t VkExternalSemaphoreFeatureFlags;
 
 enum VkResolveModeFlagBits
 {
@@ -3302,7 +3302,7 @@ enum VkResolveModeFlagBits
        VK_RESOLVE_MODE_MAX_BIT_KHR                     = VK_RESOLVE_MODE_MAX_BIT,
        VK_RESOLVE_MODE_FLAG_BITS_MAX_ENUM      = 0x7FFFFFFF,
 };
-typedef deUint32 VkResolveModeFlags;
+typedef uint32_t VkResolveModeFlags;
 
 enum VkDescriptorBindingFlagBits
 {
@@ -3316,7 +3316,7 @@ enum VkDescriptorBindingFlagBits
        VK_DESCRIPTOR_BINDING_VARIABLE_DESCRIPTOR_COUNT_BIT_EXT         = VK_DESCRIPTOR_BINDING_VARIABLE_DESCRIPTOR_COUNT_BIT,
        VK_DESCRIPTOR_BINDING_FLAG_BITS_MAX_ENUM                                        = 0x7FFFFFFF,
 };
-typedef deUint32 VkDescriptorBindingFlags;
+typedef uint32_t VkDescriptorBindingFlags;
 
 enum VkSemaphoreWaitFlagBits
 {
@@ -3324,7 +3324,7 @@ enum VkSemaphoreWaitFlagBits
        VK_SEMAPHORE_WAIT_ANY_BIT_KHR                   = VK_SEMAPHORE_WAIT_ANY_BIT,
        VK_SEMAPHORE_WAIT_FLAG_BITS_MAX_ENUM    = 0x7FFFFFFF,
 };
-typedef deUint32 VkSemaphoreWaitFlags;
+typedef uint32_t VkSemaphoreWaitFlags;
 
 enum VkSurfaceTransformFlagBitsKHR
 {
@@ -3339,7 +3339,7 @@ enum VkSurfaceTransformFlagBitsKHR
        VK_SURFACE_TRANSFORM_INHERIT_BIT_KHR                                            = 0x00000100,
        VK_SURFACE_TRANSFORM_FLAG_BITS_MAX_ENUM_KHR                                     = 0x7FFFFFFF,
 };
-typedef deUint32 VkSurfaceTransformFlagsKHR;
+typedef uint32_t VkSurfaceTransformFlagsKHR;
 
 enum VkCompositeAlphaFlagBitsKHR
 {
@@ -3349,7 +3349,7 @@ enum VkCompositeAlphaFlagBitsKHR
        VK_COMPOSITE_ALPHA_INHERIT_BIT_KHR                      = 0x00000008,
        VK_COMPOSITE_ALPHA_FLAG_BITS_MAX_ENUM_KHR       = 0x7FFFFFFF,
 };
-typedef deUint32 VkCompositeAlphaFlagsKHR;
+typedef uint32_t VkCompositeAlphaFlagsKHR;
 
 enum VkSwapchainCreateFlagBitsKHR
 {
@@ -3358,7 +3358,7 @@ enum VkSwapchainCreateFlagBitsKHR
        VK_SWAPCHAIN_CREATE_MUTABLE_FORMAT_BIT_KHR                              = 0x00000004,
        VK_SWAPCHAIN_CREATE_FLAG_BITS_MAX_ENUM_KHR                              = 0x7FFFFFFF,
 };
-typedef deUint32 VkSwapchainCreateFlagsKHR;
+typedef uint32_t VkSwapchainCreateFlagsKHR;
 
 enum VkDeviceGroupPresentModeFlagBitsKHR
 {
@@ -3368,7 +3368,7 @@ enum VkDeviceGroupPresentModeFlagBitsKHR
        VK_DEVICE_GROUP_PRESENT_MODE_LOCAL_MULTI_DEVICE_BIT_KHR = 0x00000008,
        VK_DEVICE_GROUP_PRESENT_MODE_FLAG_BITS_MAX_ENUM_KHR             = 0x7FFFFFFF,
 };
-typedef deUint32 VkDeviceGroupPresentModeFlagsKHR;
+typedef uint32_t VkDeviceGroupPresentModeFlagsKHR;
 
 enum VkDisplayPlaneAlphaFlagBitsKHR
 {
@@ -3378,7 +3378,7 @@ enum VkDisplayPlaneAlphaFlagBitsKHR
        VK_DISPLAY_PLANE_ALPHA_PER_PIXEL_PREMULTIPLIED_BIT_KHR  = 0x00000008,
        VK_DISPLAY_PLANE_ALPHA_FLAG_BITS_MAX_ENUM_KHR                   = 0x7FFFFFFF,
 };
-typedef deUint32 VkDisplayPlaneAlphaFlagsKHR;
+typedef uint32_t VkDisplayPlaneAlphaFlagsKHR;
 
 enum VkPerformanceCounterDescriptionFlagBitsKHR
 {
@@ -3388,20 +3388,20 @@ enum VkPerformanceCounterDescriptionFlagBitsKHR
        VK_PERFORMANCE_COUNTER_DESCRIPTION_CONCURRENTLY_IMPACTED_KHR            = VK_PERFORMANCE_COUNTER_DESCRIPTION_CONCURRENTLY_IMPACTED_BIT_KHR,
        VK_PERFORMANCE_COUNTER_DESCRIPTION_FLAG_BITS_MAX_ENUM_KHR                       = 0x7FFFFFFF,
 };
-typedef deUint32 VkPerformanceCounterDescriptionFlagsKHR;
+typedef uint32_t VkPerformanceCounterDescriptionFlagsKHR;
 
 enum VkAcquireProfilingLockFlagBitsKHR
 {
        VK_ACQUIRE_PROFILING_LOCK_FLAG_BITS_MAX_ENUM_KHR        = 0x7FFFFFFF,
 };
-typedef deUint32 VkAcquireProfilingLockFlagsKHR;
+typedef uint32_t VkAcquireProfilingLockFlagsKHR;
 
 enum VkSubmitFlagBitsKHR
 {
        VK_SUBMIT_PROTECTED_BIT_KHR                     = 0x00000001,
        VK_SUBMIT_FLAG_BITS_MAX_ENUM_KHR        = 0x7FFFFFFF,
 };
-typedef deUint32 VkSubmitFlagsKHR;
+typedef uint32_t VkSubmitFlagsKHR;
 
 enum VkDebugReportFlagBitsEXT
 {
@@ -3412,7 +3412,7 @@ enum VkDebugReportFlagBitsEXT
        VK_DEBUG_REPORT_DEBUG_BIT_EXT                           = 0x00000010,
        VK_DEBUG_REPORT_FLAG_BITS_MAX_ENUM_EXT          = 0x7FFFFFFF,
 };
-typedef deUint32 VkDebugReportFlagsEXT;
+typedef uint32_t VkDebugReportFlagsEXT;
 
 enum VkExternalMemoryHandleTypeFlagBitsNV
 {
@@ -3422,7 +3422,7 @@ enum VkExternalMemoryHandleTypeFlagBitsNV
        VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D11_IMAGE_KMT_BIT_NV   = 0x00000008,
        VK_EXTERNAL_MEMORY_HANDLE_TYPE_FLAG_BITS_MAX_ENUM_NV    = 0x7FFFFFFF,
 };
-typedef deUint32 VkExternalMemoryHandleTypeFlagsNV;
+typedef uint32_t VkExternalMemoryHandleTypeFlagsNV;
 
 enum VkExternalMemoryFeatureFlagBitsNV
 {
@@ -3431,14 +3431,14 @@ enum VkExternalMemoryFeatureFlagBitsNV
        VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT_NV            = 0x00000004,
        VK_EXTERNAL_MEMORY_FEATURE_FLAG_BITS_MAX_ENUM_NV        = 0x7FFFFFFF,
 };
-typedef deUint32 VkExternalMemoryFeatureFlagsNV;
+typedef uint32_t VkExternalMemoryFeatureFlagsNV;
 
 enum VkConditionalRenderingFlagBitsEXT
 {
        VK_CONDITIONAL_RENDERING_INVERTED_BIT_EXT               = 0x00000001,
        VK_CONDITIONAL_RENDERING_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF,
 };
-typedef deUint32 VkConditionalRenderingFlagsEXT;
+typedef uint32_t VkConditionalRenderingFlagsEXT;
 
 enum VkSurfaceCounterFlagBitsEXT
 {
@@ -3446,7 +3446,7 @@ enum VkSurfaceCounterFlagBitsEXT
        VK_SURFACE_COUNTER_VBLANK_EXT                           = VK_SURFACE_COUNTER_VBLANK_BIT_EXT,
        VK_SURFACE_COUNTER_FLAG_BITS_MAX_ENUM_EXT       = 0x7FFFFFFF,
 };
-typedef deUint32 VkSurfaceCounterFlagsEXT;
+typedef uint32_t VkSurfaceCounterFlagsEXT;
 
 enum VkDebugUtilsMessageSeverityFlagBitsEXT
 {
@@ -3456,7 +3456,7 @@ enum VkDebugUtilsMessageSeverityFlagBitsEXT
        VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT                   = 0x00001000,
        VK_DEBUG_UTILS_MESSAGE_SEVERITY_FLAG_BITS_MAX_ENUM_EXT  = 0x7FFFFFFF,
 };
-typedef deUint32 VkDebugUtilsMessageSeverityFlagsEXT;
+typedef uint32_t VkDebugUtilsMessageSeverityFlagsEXT;
 
 enum VkDebugUtilsMessageTypeFlagBitsEXT
 {
@@ -3465,7 +3465,7 @@ enum VkDebugUtilsMessageTypeFlagBitsEXT
        VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT         = 0x00000004,
        VK_DEBUG_UTILS_MESSAGE_TYPE_FLAG_BITS_MAX_ENUM_EXT      = 0x7FFFFFFF,
 };
-typedef deUint32 VkDebugUtilsMessageTypeFlagsEXT;
+typedef uint32_t VkDebugUtilsMessageTypeFlagsEXT;
 
 enum VkGeometryFlagBitsKHR
 {
@@ -3475,7 +3475,7 @@ enum VkGeometryFlagBitsKHR
        VK_GEOMETRY_NO_DUPLICATE_ANY_HIT_INVOCATION_BIT_NV      = VK_GEOMETRY_NO_DUPLICATE_ANY_HIT_INVOCATION_BIT_KHR,
        VK_GEOMETRY_FLAG_BITS_MAX_ENUM_KHR                                      = 0x7FFFFFFF,
 };
-typedef deUint32 VkGeometryFlagsKHR;
+typedef uint32_t VkGeometryFlagsKHR;
 
 enum VkGeometryInstanceFlagBitsKHR
 {
@@ -3489,7 +3489,7 @@ enum VkGeometryInstanceFlagBitsKHR
        VK_GEOMETRY_INSTANCE_FORCE_NO_OPAQUE_BIT_NV                                             = VK_GEOMETRY_INSTANCE_FORCE_NO_OPAQUE_BIT_KHR,
        VK_GEOMETRY_INSTANCE_FLAG_BITS_MAX_ENUM_KHR                                             = 0x7FFFFFFF,
 };
-typedef deUint32 VkGeometryInstanceFlagsKHR;
+typedef uint32_t VkGeometryInstanceFlagsKHR;
 
 enum VkBuildAccelerationStructureFlagBitsKHR
 {
@@ -3506,13 +3506,13 @@ enum VkBuildAccelerationStructureFlagBitsKHR
        VK_BUILD_ACCELERATION_STRUCTURE_LOW_MEMORY_BIT_NV                       = VK_BUILD_ACCELERATION_STRUCTURE_LOW_MEMORY_BIT_KHR,
        VK_BUILD_ACCELERATION_STRUCTURE_FLAG_BITS_MAX_ENUM_KHR          = 0x7FFFFFFF,
 };
-typedef deUint32 VkBuildAccelerationStructureFlagsKHR;
+typedef uint32_t VkBuildAccelerationStructureFlagsKHR;
 
 enum VkPipelineCompilerControlFlagBitsAMD
 {
        VK_PIPELINE_COMPILER_CONTROL_FLAG_BITS_MAX_ENUM_AMD     = 0x7FFFFFFF,
 };
-typedef deUint32 VkPipelineCompilerControlFlagsAMD;
+typedef uint32_t VkPipelineCompilerControlFlagsAMD;
 
 enum VkPipelineCreationFeedbackFlagBitsEXT
 {
@@ -3521,13 +3521,13 @@ enum VkPipelineCreationFeedbackFlagBitsEXT
        VK_PIPELINE_CREATION_FEEDBACK_BASE_PIPELINE_ACCELERATION_BIT_EXT                = 0x00000004,
        VK_PIPELINE_CREATION_FEEDBACK_FLAG_BITS_MAX_ENUM_EXT                                    = 0x7FFFFFFF,
 };
-typedef deUint32 VkPipelineCreationFeedbackFlagsEXT;
+typedef uint32_t VkPipelineCreationFeedbackFlagsEXT;
 
 enum VkShaderCorePropertiesFlagBitsAMD
 {
        VK_SHADER_CORE_PROPERTIES_FLAG_BITS_MAX_ENUM_AMD        = 0x7FFFFFFF,
 };
-typedef deUint32 VkShaderCorePropertiesFlagsAMD;
+typedef uint32_t VkShaderCorePropertiesFlagsAMD;
 
 enum VkToolPurposeFlagBitsEXT
 {
@@ -3540,14 +3540,14 @@ enum VkToolPurposeFlagBitsEXT
        VK_TOOL_PURPOSE_DEBUG_MARKERS_BIT_EXT           = 0x00000040,
        VK_TOOL_PURPOSE_FLAG_BITS_MAX_ENUM_EXT          = 0x7FFFFFFF,
 };
-typedef deUint32 VkToolPurposeFlagsEXT;
+typedef uint32_t VkToolPurposeFlagsEXT;
 
 enum VkIndirectStateFlagBitsNV
 {
        VK_INDIRECT_STATE_FLAG_FRONTFACE_BIT_NV = 0x00000001,
        VK_INDIRECT_STATE_FLAG_BITS_MAX_ENUM_NV = 0x7FFFFFFF,
 };
-typedef deUint32 VkIndirectStateFlagsNV;
+typedef uint32_t VkIndirectStateFlagsNV;
 
 enum VkIndirectCommandsLayoutUsageFlagBitsNV
 {
@@ -3556,13 +3556,13 @@ enum VkIndirectCommandsLayoutUsageFlagBitsNV
        VK_INDIRECT_COMMANDS_LAYOUT_USAGE_UNORDERED_SEQUENCES_BIT_NV    = 0x00000004,
        VK_INDIRECT_COMMANDS_LAYOUT_USAGE_FLAG_BITS_MAX_ENUM_NV                 = 0x7FFFFFFF,
 };
-typedef deUint32 VkIndirectCommandsLayoutUsageFlagsNV;
+typedef uint32_t VkIndirectCommandsLayoutUsageFlagsNV;
 
 enum VkPrivateDataSlotCreateFlagBitsEXT
 {
        VK_PRIVATE_DATA_SLOT_CREATE_FLAG_BITS_MAX_ENUM_EXT      = 0x7FFFFFFF,
 };
-typedef deUint32 VkPrivateDataSlotCreateFlagsEXT;
+typedef uint32_t VkPrivateDataSlotCreateFlagsEXT;
 
 enum VkDeviceDiagnosticsConfigFlagBitsNV
 {
@@ -3571,7 +3571,7 @@ enum VkDeviceDiagnosticsConfigFlagBitsNV
        VK_DEVICE_DIAGNOSTICS_CONFIG_ENABLE_AUTOMATIC_CHECKPOINTS_BIT_NV        = 0x00000004,
        VK_DEVICE_DIAGNOSTICS_CONFIG_FLAG_BITS_MAX_ENUM_NV                                      = 0x7FFFFFFF,
 };
-typedef deUint32 VkDeviceDiagnosticsConfigFlagsNV;
+typedef uint32_t VkDeviceDiagnosticsConfigFlagsNV;
 
 enum VkAccelerationStructureCreateFlagBitsKHR
 {
@@ -3579,7 +3579,7 @@ enum VkAccelerationStructureCreateFlagBitsKHR
        VK_ACCELERATION_STRUCTURE_CREATE_MOTION_BIT_NV                                                  = 0x00000004,
        VK_ACCELERATION_STRUCTURE_CREATE_FLAG_BITS_MAX_ENUM_KHR                                 = 0x7FFFFFFF,
 };
-typedef deUint32 VkAccelerationStructureCreateFlagsKHR;
+typedef uint32_t VkAccelerationStructureCreateFlagsKHR;
 
 enum VkVideoCodecOperationFlagBitsKHR
 {
@@ -3589,7 +3589,7 @@ enum VkVideoCodecOperationFlagBitsKHR
        VK_VIDEO_CODEC_OPERATION_DECODE_H265_BIT_EXT    = 0x00000002,
        VK_VIDEO_CODEC_OPERATION_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF,
 };
-typedef deUint32 VkVideoCodecOperationFlagsKHR;
+typedef uint32_t VkVideoCodecOperationFlagsKHR;
 
 enum VkVideoChromaSubsamplingFlagBitsKHR
 {
@@ -3600,7 +3600,7 @@ enum VkVideoChromaSubsamplingFlagBitsKHR
        VK_VIDEO_CHROMA_SUBSAMPLING_444_BIT_KHR                         = 0x00000008,
        VK_VIDEO_CHROMA_SUBSAMPLING_FLAG_BITS_MAX_ENUM_KHR      = 0x7FFFFFFF,
 };
-typedef deUint32 VkVideoChromaSubsamplingFlagsKHR;
+typedef uint32_t VkVideoChromaSubsamplingFlagsKHR;
 
 enum VkVideoComponentBitDepthFlagBitsKHR
 {
@@ -3610,7 +3610,7 @@ enum VkVideoComponentBitDepthFlagBitsKHR
        VK_VIDEO_COMPONENT_BIT_DEPTH_12_BIT_KHR                         = 0x00000010,
        VK_VIDEO_COMPONENT_BIT_DEPTH_FLAG_BITS_MAX_ENUM_KHR     = 0x7FFFFFFF,
 };
-typedef deUint32 VkVideoComponentBitDepthFlagsKHR;
+typedef uint32_t VkVideoComponentBitDepthFlagsKHR;
 
 enum VkVideoCapabilitiesFlagBitsKHR
 {
@@ -3618,7 +3618,7 @@ enum VkVideoCapabilitiesFlagBitsKHR
        VK_VIDEO_CAPABILITIES_SEPARATE_REFERENCE_IMAGES_BIT_KHR = 0x00000002,
        VK_VIDEO_CAPABILITIES_FLAG_BITS_MAX_ENUM_KHR                    = 0x7FFFFFFF,
 };
-typedef deUint32 VkVideoCapabilitiesFlagsKHR;
+typedef uint32_t VkVideoCapabilitiesFlagsKHR;
 
 enum VkVideoSessionCreateFlagBitsKHR
 {
@@ -3626,7 +3626,7 @@ enum VkVideoSessionCreateFlagBitsKHR
        VK_VIDEO_SESSION_CREATE_PROTECTED_CONTENT_BIT_KHR       = 0x00000001,
        VK_VIDEO_SESSION_CREATE_FLAG_BITS_MAX_ENUM_KHR          = 0x7FFFFFFF,
 };
-typedef deUint32 VkVideoSessionCreateFlagsKHR;
+typedef uint32_t VkVideoSessionCreateFlagsKHR;
 
 enum VkVideoCodingControlFlagBitsKHR
 {
@@ -3634,7 +3634,7 @@ enum VkVideoCodingControlFlagBitsKHR
        VK_VIDEO_CODING_CONTROL_RESET_BIT_KHR                   = 0x00000001,
        VK_VIDEO_CODING_CONTROL_FLAG_BITS_MAX_ENUM_KHR  = 0x7FFFFFFF,
 };
-typedef deUint32 VkVideoCodingControlFlagsKHR;
+typedef uint32_t VkVideoCodingControlFlagsKHR;
 
 enum VkVideoCodingQualityPresetFlagBitsKHR
 {
@@ -3644,7 +3644,7 @@ enum VkVideoCodingQualityPresetFlagBitsKHR
        VK_VIDEO_CODING_QUALITY_PRESET_QUALITY_BIT_KHR                  = 0x00000004,
        VK_VIDEO_CODING_QUALITY_PRESET_FLAG_BITS_MAX_ENUM_KHR   = 0x7FFFFFFF,
 };
-typedef deUint32 VkVideoCodingQualityPresetFlagsKHR;
+typedef uint32_t VkVideoCodingQualityPresetFlagsKHR;
 
 enum VkVideoDecodeFlagBitsKHR
 {
@@ -3652,7 +3652,7 @@ enum VkVideoDecodeFlagBitsKHR
        VK_VIDEO_DECODE_RESERVED_0_BIT_KHR              = 0x00000001,
        VK_VIDEO_DECODE_FLAG_BITS_MAX_ENUM_KHR  = 0x7FFFFFFF,
 };
-typedef deUint32 VkVideoDecodeFlagsKHR;
+typedef uint32_t VkVideoDecodeFlagsKHR;
 
 enum VkVideoEncodeFlagBitsKHR
 {
@@ -3660,7 +3660,7 @@ enum VkVideoEncodeFlagBitsKHR
        VK_VIDEO_ENCODE_RESERVED_0_BIT_KHR              = 0x00000001,
        VK_VIDEO_ENCODE_FLAG_BITS_MAX_ENUM_KHR  = 0x7FFFFFFF,
 };
-typedef deUint32 VkVideoEncodeFlagsKHR;
+typedef uint32_t VkVideoEncodeFlagsKHR;
 
 enum VkVideoEncodeRateControlFlagBitsKHR
 {
@@ -3668,7 +3668,7 @@ enum VkVideoEncodeRateControlFlagBitsKHR
        VK_VIDEO_ENCODE_RATE_CONTROL_RESET_BIT_KHR                      = 0x00000001,
        VK_VIDEO_ENCODE_RATE_CONTROL_FLAG_BITS_MAX_ENUM_KHR     = 0x7FFFFFFF,
 };
-typedef deUint32 VkVideoEncodeRateControlFlagsKHR;
+typedef uint32_t VkVideoEncodeRateControlFlagsKHR;
 
 enum VkVideoEncodeRateControlModeFlagBitsKHR
 {
@@ -3677,7 +3677,7 @@ enum VkVideoEncodeRateControlModeFlagBitsKHR
        VK_VIDEO_ENCODE_RATE_CONTROL_MODE_VBR_BIT_KHR                           = 2,
        VK_VIDEO_ENCODE_RATE_CONTROL_MODE_FLAG_BITS_MAX_ENUM_KHR        = 0x7FFFFFFF,
 };
-typedef deUint32 VkVideoEncodeRateControlModeFlagsKHR;
+typedef uint32_t VkVideoEncodeRateControlModeFlagsKHR;
 
 enum VkVideoEncodeH264CapabilitiesFlagBitsEXT
 {
@@ -3694,7 +3694,7 @@ enum VkVideoEncodeH264CapabilitiesFlagBitsEXT
        VK_VIDEO_ENCODE_H264_CAPABILITY_EVENLY_DISTRIBUTED_SLICE_SIZE_BIT_EXT   = 0x00000400,
        VK_VIDEO_ENCODE_H264_CAPABILITIES_FLAG_BITS_MAX_ENUM_EXT                                = 0x7FFFFFFF,
 };
-typedef deUint32 VkVideoEncodeH264CapabilitiesFlagsEXT;
+typedef uint32_t VkVideoEncodeH264CapabilitiesFlagsEXT;
 
 enum VkVideoEncodeH264InputModeFlagBitsEXT
 {
@@ -3703,7 +3703,7 @@ enum VkVideoEncodeH264InputModeFlagBitsEXT
        VK_VIDEO_ENCODE_H264_INPUT_MODE_NON_VCL_BIT_EXT                 = 0x00000004,
        VK_VIDEO_ENCODE_H264_INPUT_MODE_FLAG_BITS_MAX_ENUM_EXT  = 0x7FFFFFFF,
 };
-typedef deUint32 VkVideoEncodeH264InputModeFlagsEXT;
+typedef uint32_t VkVideoEncodeH264InputModeFlagsEXT;
 
 enum VkVideoEncodeH264OutputModeFlagBitsEXT
 {
@@ -3712,7 +3712,7 @@ enum VkVideoEncodeH264OutputModeFlagBitsEXT
        VK_VIDEO_ENCODE_H264_OUTPUT_MODE_NON_VCL_BIT_EXT                = 0x00000004,
        VK_VIDEO_ENCODE_H264_OUTPUT_MODE_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF,
 };
-typedef deUint32 VkVideoEncodeH264OutputModeFlagsEXT;
+typedef uint32_t VkVideoEncodeH264OutputModeFlagsEXT;
 
 enum VkVideoEncodeH264CreateFlagBitsEXT
 {
@@ -3720,7 +3720,7 @@ enum VkVideoEncodeH264CreateFlagBitsEXT
        VK_VIDEO_ENCODE_H264_CREATE_RESERVED_0_BIT_EXT          = 0x00000001,
        VK_VIDEO_ENCODE_H264_CREATE_FLAG_BITS_MAX_ENUM_EXT      = 0x7FFFFFFF,
 };
-typedef deUint32 VkVideoEncodeH264CreateFlagsEXT;
+typedef uint32_t VkVideoEncodeH264CreateFlagsEXT;
 
 enum VkVideoDecodeH264FieldLayoutFlagBitsEXT
 {
@@ -3729,109 +3729,109 @@ enum VkVideoDecodeH264FieldLayoutFlagBitsEXT
        VK_VIDEO_DECODE_H264_FIELD_LAYOUT_SEPARATE_INTERLACED_PLANE_BIT_EXT     = 0x00000002,
        VK_VIDEO_DECODE_H264_FIELD_LAYOUT_FLAG_BITS_MAX_ENUM_EXT                        = 0x7FFFFFFF,
 };
-typedef deUint32 VkVideoDecodeH264FieldLayoutFlagsEXT;
+typedef uint32_t VkVideoDecodeH264FieldLayoutFlagsEXT;
 
-typedef deUint32 VkInstanceCreateFlags;
+typedef uint32_t VkInstanceCreateFlags;
 
-typedef deUint32 VkDeviceCreateFlags;
+typedef uint32_t VkDeviceCreateFlags;
 
-typedef deUint32 VkMemoryMapFlags;
+typedef uint32_t VkMemoryMapFlags;
 
-typedef deUint32 VkSemaphoreCreateFlags;
+typedef uint32_t VkSemaphoreCreateFlags;
 
-typedef deUint32 VkQueryPoolCreateFlags;
+typedef uint32_t VkQueryPoolCreateFlags;
 
-typedef deUint32 VkBufferViewCreateFlags;
+typedef uint32_t VkBufferViewCreateFlags;
 
-typedef deUint32 VkPipelineVertexInputStateCreateFlags;
+typedef uint32_t VkPipelineVertexInputStateCreateFlags;
 
-typedef deUint32 VkPipelineInputAssemblyStateCreateFlags;
+typedef uint32_t VkPipelineInputAssemblyStateCreateFlags;
 
-typedef deUint32 VkPipelineTessellationStateCreateFlags;
+typedef uint32_t VkPipelineTessellationStateCreateFlags;
 
-typedef deUint32 VkPipelineViewportStateCreateFlags;
+typedef uint32_t VkPipelineViewportStateCreateFlags;
 
-typedef deUint32 VkPipelineRasterizationStateCreateFlags;
+typedef uint32_t VkPipelineRasterizationStateCreateFlags;
 
-typedef deUint32 VkPipelineMultisampleStateCreateFlags;
+typedef uint32_t VkPipelineMultisampleStateCreateFlags;
 
-typedef deUint32 VkPipelineDepthStencilStateCreateFlags;
+typedef uint32_t VkPipelineDepthStencilStateCreateFlags;
 
-typedef deUint32 VkPipelineColorBlendStateCreateFlags;
+typedef uint32_t VkPipelineColorBlendStateCreateFlags;
 
-typedef deUint32 VkPipelineDynamicStateCreateFlags;
+typedef uint32_t VkPipelineDynamicStateCreateFlags;
 
-typedef deUint32 VkPipelineLayoutCreateFlags;
+typedef uint32_t VkPipelineLayoutCreateFlags;
 
-typedef deUint32 VkDescriptorPoolResetFlags;
+typedef uint32_t VkDescriptorPoolResetFlags;
 
-typedef deUint32 VkCommandPoolTrimFlags;
+typedef uint32_t VkCommandPoolTrimFlags;
 
-typedef deUint32 VkDescriptorUpdateTemplateCreateFlags;
+typedef uint32_t VkDescriptorUpdateTemplateCreateFlags;
 
-typedef deUint32 VkDisplayModeCreateFlagsKHR;
+typedef uint32_t VkDisplayModeCreateFlagsKHR;
 
-typedef deUint32 VkDisplaySurfaceCreateFlagsKHR;
+typedef uint32_t VkDisplaySurfaceCreateFlagsKHR;
 
-typedef deUint32 VkPipelineRasterizationStateStreamCreateFlagsEXT;
+typedef uint32_t VkPipelineRasterizationStateStreamCreateFlagsEXT;
 
-typedef deUint32 VkPipelineViewportSwizzleStateCreateFlagsNV;
+typedef uint32_t VkPipelineViewportSwizzleStateCreateFlagsNV;
 
-typedef deUint32 VkPipelineDiscardRectangleStateCreateFlagsEXT;
+typedef uint32_t VkPipelineDiscardRectangleStateCreateFlagsEXT;
 
-typedef deUint32 VkPipelineRasterizationConservativeStateCreateFlagsEXT;
+typedef uint32_t VkPipelineRasterizationConservativeStateCreateFlagsEXT;
 
-typedef deUint32 VkPipelineRasterizationDepthClipStateCreateFlagsEXT;
+typedef uint32_t VkPipelineRasterizationDepthClipStateCreateFlagsEXT;
 
-typedef deUint32 VkDebugUtilsMessengerCallbackDataFlagsEXT;
+typedef uint32_t VkDebugUtilsMessengerCallbackDataFlagsEXT;
 
-typedef deUint32 VkDebugUtilsMessengerCreateFlagsEXT;
+typedef uint32_t VkDebugUtilsMessengerCreateFlagsEXT;
 
-typedef deUint32 VkPipelineCoverageToColorStateCreateFlagsNV;
+typedef uint32_t VkPipelineCoverageToColorStateCreateFlagsNV;
 
-typedef deUint32 VkPipelineCoverageModulationStateCreateFlagsNV;
+typedef uint32_t VkPipelineCoverageModulationStateCreateFlagsNV;
 
-typedef deUint32 VkValidationCacheCreateFlagsEXT;
+typedef uint32_t VkValidationCacheCreateFlagsEXT;
 
-typedef deUint32 VkPipelineCoverageReductionStateCreateFlagsNV;
+typedef uint32_t VkPipelineCoverageReductionStateCreateFlagsNV;
 
-typedef deUint32 VkHeadlessSurfaceCreateFlagsEXT;
+typedef uint32_t VkHeadlessSurfaceCreateFlagsEXT;
 
-typedef deUint32 VkDeviceMemoryReportFlagsEXT;
+typedef uint32_t VkDeviceMemoryReportFlagsEXT;
 
-typedef deUint32 VkAccelerationStructureMotionInfoFlagsNV;
+typedef uint32_t VkAccelerationStructureMotionInfoFlagsNV;
 
-typedef deUint32 VkAccelerationStructureMotionInstanceFlagsNV;
+typedef uint32_t VkAccelerationStructureMotionInstanceFlagsNV;
 
-typedef deUint32 VkAndroidSurfaceCreateFlagsKHR;
+typedef uint32_t VkAndroidSurfaceCreateFlagsKHR;
 
-typedef deUint32 VkVideoBeginCodingFlagsKHR;
+typedef uint32_t VkVideoBeginCodingFlagsKHR;
 
-typedef deUint32 VkVideoEndCodingFlagsKHR;
+typedef uint32_t VkVideoEndCodingFlagsKHR;
 
-typedef deUint32 VkVideoDecodeH264CreateFlagsEXT;
+typedef uint32_t VkVideoDecodeH264CreateFlagsEXT;
 
-typedef deUint32 VkVideoDecodeH265CreateFlagsEXT;
+typedef uint32_t VkVideoDecodeH265CreateFlagsEXT;
 
-typedef deUint32 VkImagePipeSurfaceCreateFlagsFUCHSIA;
+typedef uint32_t VkImagePipeSurfaceCreateFlagsFUCHSIA;
 
-typedef deUint32 VkStreamDescriptorSurfaceCreateFlagsGGP;
+typedef uint32_t VkStreamDescriptorSurfaceCreateFlagsGGP;
 
-typedef deUint32 VkIOSSurfaceCreateFlagsMVK;
+typedef uint32_t VkIOSSurfaceCreateFlagsMVK;
 
-typedef deUint32 VkMacOSSurfaceCreateFlagsMVK;
+typedef uint32_t VkMacOSSurfaceCreateFlagsMVK;
 
-typedef deUint32 VkMetalSurfaceCreateFlagsEXT;
+typedef uint32_t VkMetalSurfaceCreateFlagsEXT;
 
-typedef deUint32 VkViSurfaceCreateFlagsNN;
+typedef uint32_t VkViSurfaceCreateFlagsNN;
 
-typedef deUint32 VkWaylandSurfaceCreateFlagsKHR;
+typedef uint32_t VkWaylandSurfaceCreateFlagsKHR;
 
-typedef deUint32 VkWin32SurfaceCreateFlagsKHR;
+typedef uint32_t VkWin32SurfaceCreateFlagsKHR;
 
-typedef deUint32 VkXcbSurfaceCreateFlagsKHR;
+typedef uint32_t VkXcbSurfaceCreateFlagsKHR;
 
-typedef deUint32 VkXlibSurfaceCreateFlagsKHR;
+typedef uint32_t VkXlibSurfaceCreateFlagsKHR;
 
 typedef VkPeerMemoryFeatureFlags VkPeerMemoryFeatureFlagsKHR;
 
@@ -3957,10 +3957,10 @@ static const VkAccessFlagBits2KHR VK_ACCESS_2_COLOR_ATTACHMENT_READ_NONCOHERENT_
 
 VK_DEFINE_PLATFORM_TYPE(XlibDisplayPtr,                                void*);
 VK_DEFINE_PLATFORM_TYPE(XlibWindow,                                    deUintptr);
-VK_DEFINE_PLATFORM_TYPE(XlibVisualID,                          deUint32);
+VK_DEFINE_PLATFORM_TYPE(XlibVisualID,                          uint32_t);
 VK_DEFINE_PLATFORM_TYPE(XcbConnectionPtr,                      void*);
 VK_DEFINE_PLATFORM_TYPE(XcbWindow,                                     deUintptr);
-VK_DEFINE_PLATFORM_TYPE(XcbVisualid,                           deUint32);
+VK_DEFINE_PLATFORM_TYPE(XcbVisualid,                           uint32_t);
 VK_DEFINE_PLATFORM_TYPE(WaylandDisplayPtr,                     void*);
 VK_DEFINE_PLATFORM_TYPE(WaylandSurfacePtr,                     void*);
 VK_DEFINE_PLATFORM_TYPE(MirConnectionPtr,                      void*);
@@ -3974,9 +3974,9 @@ VK_DEFINE_PLATFORM_TYPE(AndroidHardwareBufferPtr, void*);
 VK_DEFINE_PLATFORM_TYPE(Win32MonitorHandle,                    void*);
 VK_DEFINE_PLATFORM_TYPE(Win32LPCWSTR,                          const void*);
 VK_DEFINE_PLATFORM_TYPE(RROutput,                                      void*);
-VK_DEFINE_PLATFORM_TYPE(zx_handle_t,                           deInt32);
-VK_DEFINE_PLATFORM_TYPE(GgpFrameToken,                         deInt32);
-VK_DEFINE_PLATFORM_TYPE(GgpStreamDescriptor,           deInt32);
+VK_DEFINE_PLATFORM_TYPE(zx_handle_t,                           int32_t);
+VK_DEFINE_PLATFORM_TYPE(GgpFrameToken,                         int32_t);
+VK_DEFINE_PLATFORM_TYPE(GgpStreamDescriptor,           int32_t);
 VK_DEFINE_PLATFORM_TYPE(CAMetalLayer,                          void*);
 #define VK_KHR_SURFACE_SPEC_VERSION 25
 #define VK_KHR_SWAPCHAIN_SPEC_VERSION 70
index c34cd38..8f1bfae 100644 (file)
@@ -3,28 +3,28 @@
  */
 virtual PFN_vkVoidFunction     getDeviceProcAddr                                                               (VkDevice device, const char* pName) const;
 virtual void                           destroyDevice                                                                   (VkDevice device, const VkAllocationCallbacks* pAllocator) const;
-virtual void                           getDeviceQueue                                                                  (VkDevice device, deUint32 queueFamilyIndex, deUint32 queueIndex, VkQueue* pQueue) const;
-virtual VkResult                       queueSubmit                                                                             (VkQueue queue, deUint32 submitCount, const VkSubmitInfo* pSubmits, VkFence fence) const;
+virtual void                           getDeviceQueue                                                                  (VkDevice device, uint32_t queueFamilyIndex, uint32_t queueIndex, VkQueue* pQueue) const;
+virtual VkResult                       queueSubmit                                                                             (VkQueue queue, uint32_t submitCount, const VkSubmitInfo* pSubmits, VkFence fence) const;
 virtual VkResult                       queueWaitIdle                                                                   (VkQueue queue) const;
 virtual VkResult                       deviceWaitIdle                                                                  (VkDevice device) const;
 virtual VkResult                       allocateMemory                                                                  (VkDevice device, const VkMemoryAllocateInfo* pAllocateInfo, const VkAllocationCallbacks* pAllocator, VkDeviceMemory* pMemory) const;
 virtual void                           freeMemory                                                                              (VkDevice device, VkDeviceMemory memory, const VkAllocationCallbacks* pAllocator) const;
 virtual VkResult                       mapMemory                                                                               (VkDevice device, VkDeviceMemory memory, VkDeviceSize offset, VkDeviceSize size, VkMemoryMapFlags flags, void** ppData) const;
 virtual void                           unmapMemory                                                                             (VkDevice device, VkDeviceMemory memory) const;
-virtual VkResult                       flushMappedMemoryRanges                                                 (VkDevice device, deUint32 memoryRangeCount, const VkMappedMemoryRange* pMemoryRanges) const;
-virtual VkResult                       invalidateMappedMemoryRanges                                    (VkDevice device, deUint32 memoryRangeCount, const VkMappedMemoryRange* pMemoryRanges) const;
+virtual VkResult                       flushMappedMemoryRanges                                                 (VkDevice device, uint32_t memoryRangeCount, const VkMappedMemoryRange* pMemoryRanges) const;
+virtual VkResult                       invalidateMappedMemoryRanges                                    (VkDevice device, uint32_t memoryRangeCount, const VkMappedMemoryRange* pMemoryRanges) const;
 virtual void                           getDeviceMemoryCommitment                                               (VkDevice device, VkDeviceMemory memory, VkDeviceSize* pCommittedMemoryInBytes) const;
 virtual VkResult                       bindBufferMemory                                                                (VkDevice device, VkBuffer buffer, VkDeviceMemory memory, VkDeviceSize memoryOffset) const;
 virtual VkResult                       bindImageMemory                                                                 (VkDevice device, VkImage image, VkDeviceMemory memory, VkDeviceSize memoryOffset) const;
 virtual void                           getBufferMemoryRequirements                                             (VkDevice device, VkBuffer buffer, VkMemoryRequirements* pMemoryRequirements) const;
 virtual void                           getImageMemoryRequirements                                              (VkDevice device, VkImage image, VkMemoryRequirements* pMemoryRequirements) const;
-virtual void                           getImageSparseMemoryRequirements                                (VkDevice device, VkImage image, deUint32* pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements* pSparseMemoryRequirements) const;
-virtual VkResult                       queueBindSparse                                                                 (VkQueue queue, deUint32 bindInfoCount, const VkBindSparseInfo* pBindInfo, VkFence fence) const;
+virtual void                           getImageSparseMemoryRequirements                                (VkDevice device, VkImage image, uint32_t* pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements* pSparseMemoryRequirements) const;
+virtual VkResult                       queueBindSparse                                                                 (VkQueue queue, uint32_t bindInfoCount, const VkBindSparseInfo* pBindInfo, VkFence fence) const;
 virtual VkResult                       createFence                                                                             (VkDevice device, const VkFenceCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkFence* pFence) const;
 virtual void                           destroyFence                                                                    (VkDevice device, VkFence fence, const VkAllocationCallbacks* pAllocator) const;
-virtual VkResult                       resetFences                                                                             (VkDevice device, deUint32 fenceCount, const VkFence* pFences) const;
+virtual VkResult                       resetFences                                                                             (VkDevice device, uint32_t fenceCount, const VkFence* pFences) const;
 virtual VkResult                       getFenceStatus                                                                  (VkDevice device, VkFence fence) const;
-virtual VkResult                       waitForFences                                                                   (VkDevice device, deUint32 fenceCount, const VkFence* pFences, VkBool32 waitAll, deUint64 timeout) const;
+virtual VkResult                       waitForFences                                                                   (VkDevice device, uint32_t fenceCount, const VkFence* pFences, VkBool32 waitAll, deUint64 timeout) const;
 virtual VkResult                       createSemaphore                                                                 (VkDevice device, const VkSemaphoreCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSemaphore* pSemaphore) const;
 virtual void                           destroySemaphore                                                                (VkDevice device, VkSemaphore semaphore, const VkAllocationCallbacks* pAllocator) const;
 virtual VkResult                       createEvent                                                                             (VkDevice device, const VkEventCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkEvent* pEvent) const;
@@ -34,7 +34,7 @@ virtual VkResult                      setEvent                                                                                (VkDevice device, VkEvent event) const;
 virtual VkResult                       resetEvent                                                                              (VkDevice device, VkEvent event) const;
 virtual VkResult                       createQueryPool                                                                 (VkDevice device, const VkQueryPoolCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkQueryPool* pQueryPool) const;
 virtual void                           destroyQueryPool                                                                (VkDevice device, VkQueryPool queryPool, const VkAllocationCallbacks* pAllocator) const;
-virtual VkResult                       getQueryPoolResults                                                             (VkDevice device, VkQueryPool queryPool, deUint32 firstQuery, deUint32 queryCount, deUintptr dataSize, void* pData, VkDeviceSize stride, VkQueryResultFlags flags) const;
+virtual VkResult                       getQueryPoolResults                                                             (VkDevice device, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount, deUintptr dataSize, void* pData, VkDeviceSize stride, VkQueryResultFlags flags) const;
 virtual VkResult                       createBuffer                                                                    (VkDevice device, const VkBufferCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkBuffer* pBuffer) const;
 virtual void                           destroyBuffer                                                                   (VkDevice device, VkBuffer buffer, const VkAllocationCallbacks* pAllocator) const;
 virtual VkResult                       createBufferView                                                                (VkDevice device, const VkBufferViewCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkBufferView* pView) const;
@@ -49,9 +49,9 @@ virtual void                          destroyShaderModule                                                             (VkDevice device, VkShaderModule shad
 virtual VkResult                       createPipelineCache                                                             (VkDevice device, const VkPipelineCacheCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkPipelineCache* pPipelineCache) const;
 virtual void                           destroyPipelineCache                                                    (VkDevice device, VkPipelineCache pipelineCache, const VkAllocationCallbacks* pAllocator) const;
 virtual VkResult                       getPipelineCacheData                                                    (VkDevice device, VkPipelineCache pipelineCache, deUintptr* pDataSize, void* pData) const;
-virtual VkResult                       mergePipelineCaches                                                             (VkDevice device, VkPipelineCache dstCache, deUint32 srcCacheCount, const VkPipelineCache* pSrcCaches) const;
-virtual VkResult                       createGraphicsPipelines                                                 (VkDevice device, VkPipelineCache pipelineCache, deUint32 createInfoCount, const VkGraphicsPipelineCreateInfo* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkPipeline* pPipelines) const;
-virtual VkResult                       createComputePipelines                                                  (VkDevice device, VkPipelineCache pipelineCache, deUint32 createInfoCount, const VkComputePipelineCreateInfo* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkPipeline* pPipelines) const;
+virtual VkResult                       mergePipelineCaches                                                             (VkDevice device, VkPipelineCache dstCache, uint32_t srcCacheCount, const VkPipelineCache* pSrcCaches) const;
+virtual VkResult                       createGraphicsPipelines                                                 (VkDevice device, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkGraphicsPipelineCreateInfo* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkPipeline* pPipelines) const;
+virtual VkResult                       createComputePipelines                                                  (VkDevice device, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkComputePipelineCreateInfo* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkPipeline* pPipelines) const;
 virtual void                           destroyPipeline                                                                 (VkDevice device, VkPipeline pipeline, const VkAllocationCallbacks* pAllocator) const;
 virtual VkResult                       createPipelineLayout                                                    (VkDevice device, const VkPipelineLayoutCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkPipelineLayout* pPipelineLayout) const;
 virtual void                           destroyPipelineLayout                                                   (VkDevice device, VkPipelineLayout pipelineLayout, const VkAllocationCallbacks* pAllocator) const;
@@ -63,8 +63,8 @@ virtual VkResult                      createDescriptorPool                                                    (VkDevice device, const VkDescript
 virtual void                           destroyDescriptorPool                                                   (VkDevice device, VkDescriptorPool descriptorPool, const VkAllocationCallbacks* pAllocator) const;
 virtual VkResult                       resetDescriptorPool                                                             (VkDevice device, VkDescriptorPool descriptorPool, VkDescriptorPoolResetFlags flags) const;
 virtual VkResult                       allocateDescriptorSets                                                  (VkDevice device, const VkDescriptorSetAllocateInfo* pAllocateInfo, VkDescriptorSet* pDescriptorSets) const;
-virtual VkResult                       freeDescriptorSets                                                              (VkDevice device, VkDescriptorPool descriptorPool, deUint32 descriptorSetCount, const VkDescriptorSet* pDescriptorSets) const;
-virtual void                           updateDescriptorSets                                                    (VkDevice device, deUint32 descriptorWriteCount, const VkWriteDescriptorSet* pDescriptorWrites, deUint32 descriptorCopyCount, const VkCopyDescriptorSet* pDescriptorCopies) const;
+virtual VkResult                       freeDescriptorSets                                                              (VkDevice device, VkDescriptorPool descriptorPool, uint32_t descriptorSetCount, const VkDescriptorSet* pDescriptorSets) const;
+virtual void                           updateDescriptorSets                                                    (VkDevice device, uint32_t descriptorWriteCount, const VkWriteDescriptorSet* pDescriptorWrites, uint32_t descriptorCopyCount, const VkCopyDescriptorSet* pDescriptorCopies) const;
 virtual VkResult                       createFramebuffer                                                               (VkDevice device, const VkFramebufferCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkFramebuffer* pFramebuffer) const;
 virtual void                           destroyFramebuffer                                                              (VkDevice device, VkFramebuffer framebuffer, const VkAllocationCallbacks* pAllocator) const;
 virtual VkResult                       createRenderPass                                                                (VkDevice device, const VkRenderPassCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkRenderPass* pRenderPass) const;
@@ -74,62 +74,62 @@ virtual VkResult                    createCommandPool                                                               (VkDevice device, const VkCommandPoo
 virtual void                           destroyCommandPool                                                              (VkDevice device, VkCommandPool commandPool, const VkAllocationCallbacks* pAllocator) const;
 virtual VkResult                       resetCommandPool                                                                (VkDevice device, VkCommandPool commandPool, VkCommandPoolResetFlags flags) const;
 virtual VkResult                       allocateCommandBuffers                                                  (VkDevice device, const VkCommandBufferAllocateInfo* pAllocateInfo, VkCommandBuffer* pCommandBuffers) const;
-virtual void                           freeCommandBuffers                                                              (VkDevice device, VkCommandPool commandPool, deUint32 commandBufferCount, const VkCommandBuffer* pCommandBuffers) const;
+virtual void                           freeCommandBuffers                                                              (VkDevice device, VkCommandPool commandPool, uint32_t commandBufferCount, const VkCommandBuffer* pCommandBuffers) const;
 virtual VkResult                       beginCommandBuffer                                                              (VkCommandBuffer commandBuffer, const VkCommandBufferBeginInfo* pBeginInfo) const;
 virtual VkResult                       endCommandBuffer                                                                (VkCommandBuffer commandBuffer) const;
 virtual VkResult                       resetCommandBuffer                                                              (VkCommandBuffer commandBuffer, VkCommandBufferResetFlags flags) const;
 virtual void                           cmdBindPipeline                                                                 (VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline pipeline) const;
-virtual void                           cmdSetViewport                                                                  (VkCommandBuffer commandBuffer, deUint32 firstViewport, deUint32 viewportCount, const VkViewport* pViewports) const;
-virtual void                           cmdSetScissor                                                                   (VkCommandBuffer commandBuffer, deUint32 firstScissor, deUint32 scissorCount, const VkRect2D* pScissors) const;
+virtual void                           cmdSetViewport                                                                  (VkCommandBuffer commandBuffer, uint32_t firstViewport, uint32_t viewportCount, const VkViewport* pViewports) const;
+virtual void                           cmdSetScissor                                                                   (VkCommandBuffer commandBuffer, uint32_t firstScissor, uint32_t scissorCount, const VkRect2D* pScissors) const;
 virtual void                           cmdSetLineWidth                                                                 (VkCommandBuffer commandBuffer, float lineWidth) const;
 virtual void                           cmdSetDepthBias                                                                 (VkCommandBuffer commandBuffer, float depthBiasConstantFactor, float depthBiasClamp, float depthBiasSlopeFactor) const;
 virtual void                           cmdSetBlendConstants                                                    (VkCommandBuffer commandBuffer, const float blendConstants[4]) const;
 virtual void                           cmdSetDepthBounds                                                               (VkCommandBuffer commandBuffer, float minDepthBounds, float maxDepthBounds) const;
-virtual void                           cmdSetStencilCompareMask                                                (VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, deUint32 compareMask) const;
-virtual void                           cmdSetStencilWriteMask                                                  (VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, deUint32 writeMask) const;
-virtual void                           cmdSetStencilReference                                                  (VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, deUint32 reference) const;
-virtual void                           cmdBindDescriptorSets                                                   (VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, deUint32 firstSet, deUint32 descriptorSetCount, const VkDescriptorSet* pDescriptorSets, deUint32 dynamicOffsetCount, const deUint32* pDynamicOffsets) const;
+virtual void                           cmdSetStencilCompareMask                                                (VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t compareMask) const;
+virtual void                           cmdSetStencilWriteMask                                                  (VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t writeMask) const;
+virtual void                           cmdSetStencilReference                                                  (VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t reference) const;
+virtual void                           cmdBindDescriptorSets                                                   (VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, uint32_t firstSet, uint32_t descriptorSetCount, const VkDescriptorSet* pDescriptorSets, uint32_t dynamicOffsetCount, const uint32_t* pDynamicOffsets) const;
 virtual void                           cmdBindIndexBuffer                                                              (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkIndexType indexType) const;
-virtual void                           cmdBindVertexBuffers                                                    (VkCommandBuffer commandBuffer, deUint32 firstBinding, deUint32 bindingCount, const VkBuffer* pBuffers, const VkDeviceSize* pOffsets) const;
-virtual void                           cmdDraw                                                                                 (VkCommandBuffer commandBuffer, deUint32 vertexCount, deUint32 instanceCount, deUint32 firstVertex, deUint32 firstInstance) const;
-virtual void                           cmdDrawIndexed                                                                  (VkCommandBuffer commandBuffer, deUint32 indexCount, deUint32 instanceCount, deUint32 firstIndex, deInt32 vertexOffset, deUint32 firstInstance) const;
-virtual void                           cmdDrawIndirect                                                                 (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, deUint32 drawCount, deUint32 stride) const;
-virtual void                           cmdDrawIndexedIndirect                                                  (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, deUint32 drawCount, deUint32 stride) const;
-virtual void                           cmdDispatch                                                                             (VkCommandBuffer commandBuffer, deUint32 groupCountX, deUint32 groupCountY, deUint32 groupCountZ) const;
+virtual void                           cmdBindVertexBuffers                                                    (VkCommandBuffer commandBuffer, uint32_t firstBinding, uint32_t bindingCount, const VkBuffer* pBuffers, const VkDeviceSize* pOffsets) const;
+virtual void                           cmdDraw                                                                                 (VkCommandBuffer commandBuffer, uint32_t vertexCount, uint32_t instanceCount, uint32_t firstVertex, uint32_t firstInstance) const;
+virtual void                           cmdDrawIndexed                                                                  (VkCommandBuffer commandBuffer, uint32_t indexCount, uint32_t instanceCount, uint32_t firstIndex, int32_t vertexOffset, uint32_t firstInstance) const;
+virtual void                           cmdDrawIndirect                                                                 (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride) const;
+virtual void                           cmdDrawIndexedIndirect                                                  (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride) const;
+virtual void                           cmdDispatch                                                                             (VkCommandBuffer commandBuffer, uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ) const;
 virtual void                           cmdDispatchIndirect                                                             (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset) const;
-virtual void                           cmdCopyBuffer                                                                   (VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkBuffer dstBuffer, deUint32 regionCount, const VkBufferCopy* pRegions) const;
-virtual void                           cmdCopyImage                                                                    (VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, deUint32 regionCount, const VkImageCopy* pRegions) const;
-virtual void                           cmdBlitImage                                                                    (VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, deUint32 regionCount, const VkImageBlit* pRegions, VkFilter filter) const;
-virtual void                           cmdCopyBufferToImage                                                    (VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkImage dstImage, VkImageLayout dstImageLayout, deUint32 regionCount, const VkBufferImageCopy* pRegions) const;
-virtual void                           cmdCopyImageToBuffer                                                    (VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkBuffer dstBuffer, deUint32 regionCount, const VkBufferImageCopy* pRegions) const;
+virtual void                           cmdCopyBuffer                                                                   (VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkBuffer dstBuffer, uint32_t regionCount, const VkBufferCopy* pRegions) const;
+virtual void                           cmdCopyImage                                                                    (VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageCopy* pRegions) const;
+virtual void                           cmdBlitImage                                                                    (VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageBlit* pRegions, VkFilter filter) const;
+virtual void                           cmdCopyBufferToImage                                                    (VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkBufferImageCopy* pRegions) const;
+virtual void                           cmdCopyImageToBuffer                                                    (VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkBuffer dstBuffer, uint32_t regionCount, const VkBufferImageCopy* pRegions) const;
 virtual void                           cmdUpdateBuffer                                                                 (VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize dataSize, const void* pData) const;
-virtual void                           cmdFillBuffer                                                                   (VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize size, deUint32 data) const;
-virtual void                           cmdClearColorImage                                                              (VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearColorValue* pColor, deUint32 rangeCount, const VkImageSubresourceRange* pRanges) const;
-virtual void                           cmdClearDepthStencilImage                                               (VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearDepthStencilValue* pDepthStencil, deUint32 rangeCount, const VkImageSubresourceRange* pRanges) const;
-virtual void                           cmdClearAttachments                                                             (VkCommandBuffer commandBuffer, deUint32 attachmentCount, const VkClearAttachment* pAttachments, deUint32 rectCount, const VkClearRect* pRects) const;
-virtual void                           cmdResolveImage                                                                 (VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, deUint32 regionCount, const VkImageResolve* pRegions) const;
+virtual void                           cmdFillBuffer                                                                   (VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize size, uint32_t data) const;
+virtual void                           cmdClearColorImage                                                              (VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearColorValue* pColor, uint32_t rangeCount, const VkImageSubresourceRange* pRanges) const;
+virtual void                           cmdClearDepthStencilImage                                               (VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearDepthStencilValue* pDepthStencil, uint32_t rangeCount, const VkImageSubresourceRange* pRanges) const;
+virtual void                           cmdClearAttachments                                                             (VkCommandBuffer commandBuffer, uint32_t attachmentCount, const VkClearAttachment* pAttachments, uint32_t rectCount, const VkClearRect* pRects) const;
+virtual void                           cmdResolveImage                                                                 (VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageResolve* pRegions) const;
 virtual void                           cmdSetEvent                                                                             (VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags stageMask) const;
 virtual void                           cmdResetEvent                                                                   (VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags stageMask) const;
-virtual void                           cmdWaitEvents                                                                   (VkCommandBuffer commandBuffer, deUint32 eventCount, const VkEvent* pEvents, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, deUint32 memoryBarrierCount, const VkMemoryBarrier* pMemoryBarriers, deUint32 bufferMemoryBarrierCount, const VkBufferMemoryBarrier* pBufferMemoryBarriers, deUint32 imageMemoryBarrierCount, const VkImageMemoryBarrier* pImageMemoryBarriers) const;
-virtual void                           cmdPipelineBarrier                                                              (VkCommandBuffer commandBuffer, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, VkDependencyFlags dependencyFlags, deUint32 memoryBarrierCount, const VkMemoryBarrier* pMemoryBarriers, deUint32 bufferMemoryBarrierCount, const VkBufferMemoryBarrier* pBufferMemoryBarriers, deUint32 imageMemoryBarrierCount, const VkImageMemoryBarrier* pImageMemoryBarriers) const;
-virtual void                           cmdBeginQuery                                                                   (VkCommandBuffer commandBuffer, VkQueryPool queryPool, deUint32 query, VkQueryControlFlags flags) const;
-virtual void                           cmdEndQuery                                                                             (VkCommandBuffer commandBuffer, VkQueryPool queryPool, deUint32 query) const;
-virtual void                           cmdResetQueryPool                                                               (VkCommandBuffer commandBuffer, VkQueryPool queryPool, deUint32 firstQuery, deUint32 queryCount) const;
-virtual void                           cmdWriteTimestamp                                                               (VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkQueryPool queryPool, deUint32 query) const;
-virtual void                           cmdCopyQueryPoolResults                                                 (VkCommandBuffer commandBuffer, VkQueryPool queryPool, deUint32 firstQuery, deUint32 queryCount, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize stride, VkQueryResultFlags flags) const;
-virtual void                           cmdPushConstants                                                                (VkCommandBuffer commandBuffer, VkPipelineLayout layout, VkShaderStageFlags stageFlags, deUint32 offset, deUint32 size, const void* pValues) const;
+virtual void                           cmdWaitEvents                                                                   (VkCommandBuffer commandBuffer, uint32_t eventCount, const VkEvent* pEvents, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, uint32_t memoryBarrierCount, const VkMemoryBarrier* pMemoryBarriers, uint32_t bufferMemoryBarrierCount, const VkBufferMemoryBarrier* pBufferMemoryBarriers, uint32_t imageMemoryBarrierCount, const VkImageMemoryBarrier* pImageMemoryBarriers) const;
+virtual void                           cmdPipelineBarrier                                                              (VkCommandBuffer commandBuffer, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, VkDependencyFlags dependencyFlags, uint32_t memoryBarrierCount, const VkMemoryBarrier* pMemoryBarriers, uint32_t bufferMemoryBarrierCount, const VkBufferMemoryBarrier* pBufferMemoryBarriers, uint32_t imageMemoryBarrierCount, const VkImageMemoryBarrier* pImageMemoryBarriers) const;
+virtual void                           cmdBeginQuery                                                                   (VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query, VkQueryControlFlags flags) const;
+virtual void                           cmdEndQuery                                                                             (VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query) const;
+virtual void                           cmdResetQueryPool                                                               (VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount) const;
+virtual void                           cmdWriteTimestamp                                                               (VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkQueryPool queryPool, uint32_t query) const;
+virtual void                           cmdCopyQueryPoolResults                                                 (VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize stride, VkQueryResultFlags flags) const;
+virtual void                           cmdPushConstants                                                                (VkCommandBuffer commandBuffer, VkPipelineLayout layout, VkShaderStageFlags stageFlags, uint32_t offset, uint32_t size, const void* pValues) const;
 virtual void                           cmdBeginRenderPass                                                              (VkCommandBuffer commandBuffer, const VkRenderPassBeginInfo* pRenderPassBegin, VkSubpassContents contents) const;
 virtual void                           cmdNextSubpass                                                                  (VkCommandBuffer commandBuffer, VkSubpassContents contents) const;
 virtual void                           cmdEndRenderPass                                                                (VkCommandBuffer commandBuffer) const;
-virtual void                           cmdExecuteCommands                                                              (VkCommandBuffer commandBuffer, deUint32 commandBufferCount, const VkCommandBuffer* pCommandBuffers) const;
-virtual VkResult                       bindBufferMemory2                                                               (VkDevice device, deUint32 bindInfoCount, const VkBindBufferMemoryInfo* pBindInfos) const;
-virtual VkResult                       bindImageMemory2                                                                (VkDevice device, deUint32 bindInfoCount, const VkBindImageMemoryInfo* pBindInfos) const;
-virtual void                           getDeviceGroupPeerMemoryFeatures                                (VkDevice device, deUint32 heapIndex, deUint32 localDeviceIndex, deUint32 remoteDeviceIndex, VkPeerMemoryFeatureFlags* pPeerMemoryFeatures) const;
-virtual void                           cmdSetDeviceMask                                                                (VkCommandBuffer commandBuffer, deUint32 deviceMask) const;
-virtual void                           cmdDispatchBase                                                                 (VkCommandBuffer commandBuffer, deUint32 baseGroupX, deUint32 baseGroupY, deUint32 baseGroupZ, deUint32 groupCountX, deUint32 groupCountY, deUint32 groupCountZ) const;
+virtual void                           cmdExecuteCommands                                                              (VkCommandBuffer commandBuffer, uint32_t commandBufferCount, const VkCommandBuffer* pCommandBuffers) const;
+virtual VkResult                       bindBufferMemory2                                                               (VkDevice device, uint32_t bindInfoCount, const VkBindBufferMemoryInfo* pBindInfos) const;
+virtual VkResult                       bindImageMemory2                                                                (VkDevice device, uint32_t bindInfoCount, const VkBindImageMemoryInfo* pBindInfos) const;
+virtual void                           getDeviceGroupPeerMemoryFeatures                                (VkDevice device, uint32_t heapIndex, uint32_t localDeviceIndex, uint32_t remoteDeviceIndex, VkPeerMemoryFeatureFlags* pPeerMemoryFeatures) const;
+virtual void                           cmdSetDeviceMask                                                                (VkCommandBuffer commandBuffer, uint32_t deviceMask) const;
+virtual void                           cmdDispatchBase                                                                 (VkCommandBuffer commandBuffer, uint32_t baseGroupX, uint32_t baseGroupY, uint32_t baseGroupZ, uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ) const;
 virtual void                           getImageMemoryRequirements2                                             (VkDevice device, const VkImageMemoryRequirementsInfo2* pInfo, VkMemoryRequirements2* pMemoryRequirements) const;
 virtual void                           getBufferMemoryRequirements2                                    (VkDevice device, const VkBufferMemoryRequirementsInfo2* pInfo, VkMemoryRequirements2* pMemoryRequirements) const;
-virtual void                           getImageSparseMemoryRequirements2                               (VkDevice device, const VkImageSparseMemoryRequirementsInfo2* pInfo, deUint32* pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements2* pSparseMemoryRequirements) const;
+virtual void                           getImageSparseMemoryRequirements2                               (VkDevice device, const VkImageSparseMemoryRequirementsInfo2* pInfo, uint32_t* pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements2* pSparseMemoryRequirements) const;
 virtual void                           trimCommandPool                                                                 (VkDevice device, VkCommandPool commandPool, VkCommandPoolTrimFlags flags) const;
 virtual void                           getDeviceQueue2                                                                 (VkDevice device, const VkDeviceQueueInfo2* pQueueInfo, VkQueue* pQueue) const;
 virtual VkResult                       createSamplerYcbcrConversion                                    (VkDevice device, const VkSamplerYcbcrConversionCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSamplerYcbcrConversion* pYcbcrConversion) const;
@@ -138,13 +138,13 @@ virtual VkResult                  createDescriptorUpdateTemplate                                  (VkDevice device, const Vk
 virtual void                           destroyDescriptorUpdateTemplate                                 (VkDevice device, VkDescriptorUpdateTemplate descriptorUpdateTemplate, const VkAllocationCallbacks* pAllocator) const;
 virtual void                           updateDescriptorSetWithTemplate                                 (VkDevice device, VkDescriptorSet descriptorSet, VkDescriptorUpdateTemplate descriptorUpdateTemplate, const void* pData) const;
 virtual void                           getDescriptorSetLayoutSupport                                   (VkDevice device, const VkDescriptorSetLayoutCreateInfo* pCreateInfo, VkDescriptorSetLayoutSupport* pSupport) const;
-virtual void                           cmdDrawIndirectCount                                                    (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, deUint32 maxDrawCount, deUint32 stride) const;
-virtual void                           cmdDrawIndexedIndirectCount                                             (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, deUint32 maxDrawCount, deUint32 stride) const;
+virtual void                           cmdDrawIndirectCount                                                    (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride) const;
+virtual void                           cmdDrawIndexedIndirectCount                                             (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride) const;
 virtual VkResult                       createRenderPass2                                                               (VkDevice device, const VkRenderPassCreateInfo2* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkRenderPass* pRenderPass) const;
 virtual void                           cmdBeginRenderPass2                                                             (VkCommandBuffer commandBuffer, const VkRenderPassBeginInfo* pRenderPassBegin, const VkSubpassBeginInfo* pSubpassBeginInfo) const;
 virtual void                           cmdNextSubpass2                                                                 (VkCommandBuffer commandBuffer, const VkSubpassBeginInfo* pSubpassBeginInfo, const VkSubpassEndInfo* pSubpassEndInfo) const;
 virtual void                           cmdEndRenderPass2                                                               (VkCommandBuffer commandBuffer, const VkSubpassEndInfo* pSubpassEndInfo) const;
-virtual void                           resetQueryPool                                                                  (VkDevice device, VkQueryPool queryPool, deUint32 firstQuery, deUint32 queryCount) const;
+virtual void                           resetQueryPool                                                                  (VkDevice device, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount) const;
 virtual VkResult                       getSemaphoreCounterValue                                                (VkDevice device, VkSemaphore semaphore, deUint64* pValue) const;
 virtual VkResult                       waitSemaphores                                                                  (VkDevice device, const VkSemaphoreWaitInfo* pWaitInfo, deUint64 timeout) const;
 virtual VkResult                       signalSemaphore                                                                 (VkDevice device, const VkSemaphoreSignalInfo* pSignalInfo) const;
@@ -153,19 +153,19 @@ virtual uint64_t                  getBufferOpaqueCaptureAddress                                   (VkDevice device, const VkB
 virtual uint64_t                       getDeviceMemoryOpaqueCaptureAddress                             (VkDevice device, const VkDeviceMemoryOpaqueCaptureAddressInfo* pInfo) const;
 virtual VkResult                       createSwapchainKHR                                                              (VkDevice device, const VkSwapchainCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSwapchainKHR* pSwapchain) const;
 virtual void                           destroySwapchainKHR                                                             (VkDevice device, VkSwapchainKHR swapchain, const VkAllocationCallbacks* pAllocator) const;
-virtual VkResult                       getSwapchainImagesKHR                                                   (VkDevice device, VkSwapchainKHR swapchain, deUint32* pSwapchainImageCount, VkImage* pSwapchainImages) const;
-virtual VkResult                       acquireNextImageKHR                                                             (VkDevice device, VkSwapchainKHR swapchain, deUint64 timeout, VkSemaphore semaphore, VkFence fence, deUint32* pImageIndex) const;
+virtual VkResult                       getSwapchainImagesKHR                                                   (VkDevice device, VkSwapchainKHR swapchain, uint32_t* pSwapchainImageCount, VkImage* pSwapchainImages) const;
+virtual VkResult                       acquireNextImageKHR                                                             (VkDevice device, VkSwapchainKHR swapchain, deUint64 timeout, VkSemaphore semaphore, VkFence fence, uint32_t* pImageIndex) const;
 virtual VkResult                       queuePresentKHR                                                                 (VkQueue queue, const VkPresentInfoKHR* pPresentInfo) const;
 virtual VkResult                       getDeviceGroupPresentCapabilitiesKHR                    (VkDevice device, VkDeviceGroupPresentCapabilitiesKHR* pDeviceGroupPresentCapabilities) const;
 virtual VkResult                       getDeviceGroupSurfacePresentModesKHR                    (VkDevice device, VkSurfaceKHR surface, VkDeviceGroupPresentModeFlagsKHR* pModes) const;
-virtual VkResult                       acquireNextImage2KHR                                                    (VkDevice device, const VkAcquireNextImageInfoKHR* pAcquireInfo, deUint32* pImageIndex) const;
-virtual VkResult                       createSharedSwapchainsKHR                                               (VkDevice device, deUint32 swapchainCount, const VkSwapchainCreateInfoKHR* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkSwapchainKHR* pSwapchains) const;
+virtual VkResult                       acquireNextImage2KHR                                                    (VkDevice device, const VkAcquireNextImageInfoKHR* pAcquireInfo, uint32_t* pImageIndex) const;
+virtual VkResult                       createSharedSwapchainsKHR                                               (VkDevice device, uint32_t swapchainCount, const VkSwapchainCreateInfoKHR* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkSwapchainKHR* pSwapchains) const;
 virtual VkResult                       getMemoryFdKHR                                                                  (VkDevice device, const VkMemoryGetFdInfoKHR* pGetFdInfo, int* pFd) const;
 virtual VkResult                       getMemoryFdPropertiesKHR                                                (VkDevice device, VkExternalMemoryHandleTypeFlagBits handleType, int fd, VkMemoryFdPropertiesKHR* pMemoryFdProperties) const;
 virtual VkResult                       importSemaphoreFdKHR                                                    (VkDevice device, const VkImportSemaphoreFdInfoKHR* pImportSemaphoreFdInfo) const;
 virtual VkResult                       getSemaphoreFdKHR                                                               (VkDevice device, const VkSemaphoreGetFdInfoKHR* pGetFdInfo, int* pFd) const;
-virtual void                           cmdPushDescriptorSetKHR                                                 (VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, deUint32 set, deUint32 descriptorWriteCount, const VkWriteDescriptorSet* pDescriptorWrites) const;
-virtual void                           cmdPushDescriptorSetWithTemplateKHR                             (VkCommandBuffer commandBuffer, VkDescriptorUpdateTemplate descriptorUpdateTemplate, VkPipelineLayout layout, deUint32 set, const void* pData) const;
+virtual void                           cmdPushDescriptorSetKHR                                                 (VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, uint32_t set, uint32_t descriptorWriteCount, const VkWriteDescriptorSet* pDescriptorWrites) const;
+virtual void                           cmdPushDescriptorSetWithTemplateKHR                             (VkCommandBuffer commandBuffer, VkDescriptorUpdateTemplate descriptorUpdateTemplate, VkPipelineLayout layout, uint32_t set, const void* pData) const;
 virtual VkResult                       getSwapchainStatusKHR                                                   (VkDevice device, VkSwapchainKHR swapchain) const;
 virtual VkResult                       importFenceFdKHR                                                                (VkDevice device, const VkImportFenceFdInfoKHR* pImportFenceFdInfo) const;
 virtual VkResult                       getFenceFdKHR                                                                   (VkDevice device, const VkFenceGetFdInfoKHR* pGetFdInfo, int* pFd) const;
@@ -177,17 +177,17 @@ virtual void                              destroyDeferredOperationKHR                                             (VkDevice device, VkDeferredOpe
 virtual uint32_t                       getDeferredOperationMaxConcurrencyKHR                   (VkDevice device, VkDeferredOperationKHR operation) const;
 virtual VkResult                       getDeferredOperationResultKHR                                   (VkDevice device, VkDeferredOperationKHR operation) const;
 virtual VkResult                       deferredOperationJoinKHR                                                (VkDevice device, VkDeferredOperationKHR operation) const;
-virtual VkResult                       getPipelineExecutablePropertiesKHR                              (VkDevice device, const VkPipelineInfoKHR* pPipelineInfo, deUint32* pExecutableCount, VkPipelineExecutablePropertiesKHR* pProperties) const;
-virtual VkResult                       getPipelineExecutableStatisticsKHR                              (VkDevice device, const VkPipelineExecutableInfoKHR* pExecutableInfo, deUint32* pStatisticCount, VkPipelineExecutableStatisticKHR* pStatistics) const;
-virtual VkResult                       getPipelineExecutableInternalRepresentationsKHR (VkDevice device, const VkPipelineExecutableInfoKHR* pExecutableInfo, deUint32* pInternalRepresentationCount, VkPipelineExecutableInternalRepresentationKHR* pInternalRepresentations) const;
+virtual VkResult                       getPipelineExecutablePropertiesKHR                              (VkDevice device, const VkPipelineInfoKHR* pPipelineInfo, uint32_t* pExecutableCount, VkPipelineExecutablePropertiesKHR* pProperties) const;
+virtual VkResult                       getPipelineExecutableStatisticsKHR                              (VkDevice device, const VkPipelineExecutableInfoKHR* pExecutableInfo, uint32_t* pStatisticCount, VkPipelineExecutableStatisticKHR* pStatistics) const;
+virtual VkResult                       getPipelineExecutableInternalRepresentationsKHR (VkDevice device, const VkPipelineExecutableInfoKHR* pExecutableInfo, uint32_t* pInternalRepresentationCount, VkPipelineExecutableInternalRepresentationKHR* pInternalRepresentations) const;
 virtual void                           cmdSetEvent2KHR                                                                 (VkCommandBuffer commandBuffer, VkEvent event, const VkDependencyInfoKHR* pDependencyInfo) const;
 virtual void                           cmdResetEvent2KHR                                                               (VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags2KHR stageMask) const;
-virtual void                           cmdWaitEvents2KHR                                                               (VkCommandBuffer commandBuffer, deUint32 eventCount, const VkEvent* pEvents, const VkDependencyInfoKHR* pDependencyInfos) const;
+virtual void                           cmdWaitEvents2KHR                                                               (VkCommandBuffer commandBuffer, uint32_t eventCount, const VkEvent* pEvents, const VkDependencyInfoKHR* pDependencyInfos) const;
 virtual void                           cmdPipelineBarrier2KHR                                                  (VkCommandBuffer commandBuffer, const VkDependencyInfoKHR* pDependencyInfo) const;
-virtual void                           cmdWriteTimestamp2KHR                                                   (VkCommandBuffer commandBuffer, VkPipelineStageFlags2KHR stage, VkQueryPool queryPool, deUint32 query) const;
-virtual VkResult                       queueSubmit2KHR                                                                 (VkQueue queue, deUint32 submitCount, const VkSubmitInfo2KHR* pSubmits, VkFence fence) const;
-virtual void                           cmdWriteBufferMarker2AMD                                                (VkCommandBuffer commandBuffer, VkPipelineStageFlags2KHR stage, VkBuffer dstBuffer, VkDeviceSize dstOffset, deUint32 marker) const;
-virtual void                           getQueueCheckpointData2NV                                               (VkQueue queue, deUint32* pCheckpointDataCount, VkCheckpointData2NV* pCheckpointData) const;
+virtual void                           cmdWriteTimestamp2KHR                                                   (VkCommandBuffer commandBuffer, VkPipelineStageFlags2KHR stage, VkQueryPool queryPool, uint32_t query) const;
+virtual VkResult                       queueSubmit2KHR                                                                 (VkQueue queue, uint32_t submitCount, const VkSubmitInfo2KHR* pSubmits, VkFence fence) const;
+virtual void                           cmdWriteBufferMarker2AMD                                                (VkCommandBuffer commandBuffer, VkPipelineStageFlags2KHR stage, VkBuffer dstBuffer, VkDeviceSize dstOffset, uint32_t marker) const;
+virtual void                           getQueueCheckpointData2NV                                               (VkQueue queue, uint32_t* pCheckpointDataCount, VkCheckpointData2NV* pCheckpointData) const;
 virtual void                           cmdCopyBuffer2KHR                                                               (VkCommandBuffer commandBuffer, const VkCopyBufferInfo2KHR* pCopyBufferInfo) const;
 virtual void                           cmdCopyImage2KHR                                                                (VkCommandBuffer commandBuffer, const VkCopyImageInfo2KHR* pCopyImageInfo) const;
 virtual void                           cmdCopyBufferToImage2KHR                                                (VkCommandBuffer commandBuffer, const VkCopyBufferToImageInfo2KHR* pCopyBufferToImageInfo) const;
@@ -199,12 +199,12 @@ virtual VkResult                  debugMarkerSetObjectNameEXT                                             (VkDevice device, const VkDe
 virtual void                           cmdDebugMarkerBeginEXT                                                  (VkCommandBuffer commandBuffer, const VkDebugMarkerMarkerInfoEXT* pMarkerInfo) const;
 virtual void                           cmdDebugMarkerEndEXT                                                    (VkCommandBuffer commandBuffer) const;
 virtual void                           cmdDebugMarkerInsertEXT                                                 (VkCommandBuffer commandBuffer, const VkDebugMarkerMarkerInfoEXT* pMarkerInfo) const;
-virtual void                           cmdBindTransformFeedbackBuffersEXT                              (VkCommandBuffer commandBuffer, deUint32 firstBinding, deUint32 bindingCount, const VkBuffer* pBuffers, const VkDeviceSize* pOffsets, const VkDeviceSize* pSizes) const;
-virtual void                           cmdBeginTransformFeedbackEXT                                    (VkCommandBuffer commandBuffer, deUint32 firstCounterBuffer, deUint32 counterBufferCount, const VkBuffer* pCounterBuffers, const VkDeviceSize* pCounterBufferOffsets) const;
-virtual void                           cmdEndTransformFeedbackEXT                                              (VkCommandBuffer commandBuffer, deUint32 firstCounterBuffer, deUint32 counterBufferCount, const VkBuffer* pCounterBuffers, const VkDeviceSize* pCounterBufferOffsets) const;
-virtual void                           cmdBeginQueryIndexedEXT                                                 (VkCommandBuffer commandBuffer, VkQueryPool queryPool, deUint32 query, VkQueryControlFlags flags, deUint32 index) const;
-virtual void                           cmdEndQueryIndexedEXT                                                   (VkCommandBuffer commandBuffer, VkQueryPool queryPool, deUint32 query, deUint32 index) const;
-virtual void                           cmdDrawIndirectByteCountEXT                                             (VkCommandBuffer commandBuffer, deUint32 instanceCount, deUint32 firstInstance, VkBuffer counterBuffer, VkDeviceSize counterBufferOffset, deUint32 counterOffset, deUint32 vertexStride) const;
+virtual void                           cmdBindTransformFeedbackBuffersEXT                              (VkCommandBuffer commandBuffer, uint32_t firstBinding, uint32_t bindingCount, const VkBuffer* pBuffers, const VkDeviceSize* pOffsets, const VkDeviceSize* pSizes) const;
+virtual void                           cmdBeginTransformFeedbackEXT                                    (VkCommandBuffer commandBuffer, uint32_t firstCounterBuffer, uint32_t counterBufferCount, const VkBuffer* pCounterBuffers, const VkDeviceSize* pCounterBufferOffsets) const;
+virtual void                           cmdEndTransformFeedbackEXT                                              (VkCommandBuffer commandBuffer, uint32_t firstCounterBuffer, uint32_t counterBufferCount, const VkBuffer* pCounterBuffers, const VkDeviceSize* pCounterBufferOffsets) const;
+virtual void                           cmdBeginQueryIndexedEXT                                                 (VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query, VkQueryControlFlags flags, uint32_t index) const;
+virtual void                           cmdEndQueryIndexedEXT                                                   (VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query, uint32_t index) const;
+virtual void                           cmdDrawIndirectByteCountEXT                                             (VkCommandBuffer commandBuffer, uint32_t instanceCount, uint32_t firstInstance, VkBuffer counterBuffer, VkDeviceSize counterBufferOffset, uint32_t counterOffset, uint32_t vertexStride) const;
 virtual VkResult                       createCuModuleNVX                                                               (VkDevice device, const VkCuModuleCreateInfoNVX* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkCuModuleNVX* pModule) const;
 virtual VkResult                       createCuFunctionNVX                                                             (VkDevice device, const VkCuFunctionCreateInfoNVX* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkCuFunctionNVX* pFunction) const;
 virtual void                           destroyCuModuleNVX                                                              (VkDevice device, VkCuModuleNVX module, const VkAllocationCallbacks* pAllocator) const;
@@ -212,20 +212,20 @@ virtual void                              destroyCuFunctionNVX                                                    (VkDevice device, VkCuFunctionNVX fun
 virtual void                           cmdCuLaunchKernelNVX                                                    (VkCommandBuffer commandBuffer, const VkCuLaunchInfoNVX* pLaunchInfo) const;
 virtual uint32_t                       getImageViewHandleNVX                                                   (VkDevice device, const VkImageViewHandleInfoNVX* pInfo) const;
 virtual VkResult                       getImageViewAddressNVX                                                  (VkDevice device, VkImageView imageView, VkImageViewAddressPropertiesNVX* pProperties) const;
-virtual void                           cmdDrawIndirectCountAMD                                                 (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, deUint32 maxDrawCount, deUint32 stride) const;
-virtual void                           cmdDrawIndexedIndirectCountAMD                                  (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, deUint32 maxDrawCount, deUint32 stride) const;
+virtual void                           cmdDrawIndirectCountAMD                                                 (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride) const;
+virtual void                           cmdDrawIndexedIndirectCountAMD                                  (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride) const;
 virtual VkResult                       getShaderInfoAMD                                                                (VkDevice device, VkPipeline pipeline, VkShaderStageFlagBits shaderStage, VkShaderInfoTypeAMD infoType, deUintptr* pInfoSize, void* pInfo) const;
 virtual void                           cmdBeginConditionalRenderingEXT                                 (VkCommandBuffer commandBuffer, const VkConditionalRenderingBeginInfoEXT* pConditionalRenderingBegin) const;
 virtual void                           cmdEndConditionalRenderingEXT                                   (VkCommandBuffer commandBuffer) const;
-virtual void                           cmdSetViewportWScalingNV                                                (VkCommandBuffer commandBuffer, deUint32 firstViewport, deUint32 viewportCount, const VkViewportWScalingNV* pViewportWScalings) const;
+virtual void                           cmdSetViewportWScalingNV                                                (VkCommandBuffer commandBuffer, uint32_t firstViewport, uint32_t viewportCount, const VkViewportWScalingNV* pViewportWScalings) const;
 virtual VkResult                       displayPowerControlEXT                                                  (VkDevice device, VkDisplayKHR display, const VkDisplayPowerInfoEXT* pDisplayPowerInfo) const;
 virtual VkResult                       registerDeviceEventEXT                                                  (VkDevice device, const VkDeviceEventInfoEXT* pDeviceEventInfo, const VkAllocationCallbacks* pAllocator, VkFence* pFence) const;
 virtual VkResult                       registerDisplayEventEXT                                                 (VkDevice device, VkDisplayKHR display, const VkDisplayEventInfoEXT* pDisplayEventInfo, const VkAllocationCallbacks* pAllocator, VkFence* pFence) const;
 virtual VkResult                       getSwapchainCounterEXT                                                  (VkDevice device, VkSwapchainKHR swapchain, VkSurfaceCounterFlagBitsEXT counter, deUint64* pCounterValue) const;
 virtual VkResult                       getRefreshCycleDurationGOOGLE                                   (VkDevice device, VkSwapchainKHR swapchain, VkRefreshCycleDurationGOOGLE* pDisplayTimingProperties) const;
-virtual VkResult                       getPastPresentationTimingGOOGLE                                 (VkDevice device, VkSwapchainKHR swapchain, deUint32* pPresentationTimingCount, VkPastPresentationTimingGOOGLE* pPresentationTimings) const;
-virtual void                           cmdSetDiscardRectangleEXT                                               (VkCommandBuffer commandBuffer, deUint32 firstDiscardRectangle, deUint32 discardRectangleCount, const VkRect2D* pDiscardRectangles) const;
-virtual void                           setHdrMetadataEXT                                                               (VkDevice device, deUint32 swapchainCount, const VkSwapchainKHR* pSwapchains, const VkHdrMetadataEXT* pMetadata) const;
+virtual VkResult                       getPastPresentationTimingGOOGLE                                 (VkDevice device, VkSwapchainKHR swapchain, uint32_t* pPresentationTimingCount, VkPastPresentationTimingGOOGLE* pPresentationTimings) const;
+virtual void                           cmdSetDiscardRectangleEXT                                               (VkCommandBuffer commandBuffer, uint32_t firstDiscardRectangle, uint32_t discardRectangleCount, const VkRect2D* pDiscardRectangles) const;
+virtual void                           setHdrMetadataEXT                                                               (VkDevice device, uint32_t swapchainCount, const VkSwapchainKHR* pSwapchains, const VkHdrMetadataEXT* pMetadata) const;
 virtual VkResult                       setDebugUtilsObjectNameEXT                                              (VkDevice device, const VkDebugUtilsObjectNameInfoEXT* pNameInfo) const;
 virtual VkResult                       setDebugUtilsObjectTagEXT                                               (VkDevice device, const VkDebugUtilsObjectTagInfoEXT* pTagInfo) const;
 virtual void                           queueBeginDebugUtilsLabelEXT                                    (VkQueue queue, const VkDebugUtilsLabelEXT* pLabelInfo) const;
@@ -238,33 +238,33 @@ virtual void                              cmdSetSampleLocationsEXT                                                (VkCommandBuffer commandBuffer, co
 virtual VkResult                       getImageDrmFormatModifierPropertiesEXT                  (VkDevice device, VkImage image, VkImageDrmFormatModifierPropertiesEXT* pProperties) const;
 virtual VkResult                       createValidationCacheEXT                                                (VkDevice device, const VkValidationCacheCreateInfoEXT* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkValidationCacheEXT* pValidationCache) const;
 virtual void                           destroyValidationCacheEXT                                               (VkDevice device, VkValidationCacheEXT validationCache, const VkAllocationCallbacks* pAllocator) const;
-virtual VkResult                       mergeValidationCachesEXT                                                (VkDevice device, VkValidationCacheEXT dstCache, deUint32 srcCacheCount, const VkValidationCacheEXT* pSrcCaches) const;
+virtual VkResult                       mergeValidationCachesEXT                                                (VkDevice device, VkValidationCacheEXT dstCache, uint32_t srcCacheCount, const VkValidationCacheEXT* pSrcCaches) const;
 virtual VkResult                       getValidationCacheDataEXT                                               (VkDevice device, VkValidationCacheEXT validationCache, deUintptr* pDataSize, void* pData) const;
 virtual void                           cmdBindShadingRateImageNV                                               (VkCommandBuffer commandBuffer, VkImageView imageView, VkImageLayout imageLayout) const;
-virtual void                           cmdSetViewportShadingRatePaletteNV                              (VkCommandBuffer commandBuffer, deUint32 firstViewport, deUint32 viewportCount, const VkShadingRatePaletteNV* pShadingRatePalettes) const;
-virtual void                           cmdSetCoarseSampleOrderNV                                               (VkCommandBuffer commandBuffer, VkCoarseSampleOrderTypeNV sampleOrderType, deUint32 customSampleOrderCount, const VkCoarseSampleOrderCustomNV* pCustomSampleOrders) const;
+virtual void                           cmdSetViewportShadingRatePaletteNV                              (VkCommandBuffer commandBuffer, uint32_t firstViewport, uint32_t viewportCount, const VkShadingRatePaletteNV* pShadingRatePalettes) const;
+virtual void                           cmdSetCoarseSampleOrderNV                                               (VkCommandBuffer commandBuffer, VkCoarseSampleOrderTypeNV sampleOrderType, uint32_t customSampleOrderCount, const VkCoarseSampleOrderCustomNV* pCustomSampleOrders) const;
 virtual VkResult                       createAccelerationStructureNV                                   (VkDevice device, const VkAccelerationStructureCreateInfoNV* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkAccelerationStructureNV* pAccelerationStructure) const;
 virtual void                           destroyAccelerationStructureNV                                  (VkDevice device, VkAccelerationStructureNV accelerationStructure, const VkAllocationCallbacks* pAllocator) const;
 virtual void                           getAccelerationStructureMemoryRequirementsNV    (VkDevice device, const VkAccelerationStructureMemoryRequirementsInfoNV* pInfo, VkMemoryRequirements2KHR* pMemoryRequirements) const;
-virtual VkResult                       bindAccelerationStructureMemoryNV                               (VkDevice device, deUint32 bindInfoCount, const VkBindAccelerationStructureMemoryInfoNV* pBindInfos) const;
+virtual VkResult                       bindAccelerationStructureMemoryNV                               (VkDevice device, uint32_t bindInfoCount, const VkBindAccelerationStructureMemoryInfoNV* pBindInfos) const;
 virtual void                           cmdBuildAccelerationStructureNV                                 (VkCommandBuffer commandBuffer, const VkAccelerationStructureInfoNV* pInfo, VkBuffer instanceData, VkDeviceSize instanceOffset, VkBool32 update, VkAccelerationStructureNV dst, VkAccelerationStructureNV src, VkBuffer scratch, VkDeviceSize scratchOffset) const;
 virtual void                           cmdCopyAccelerationStructureNV                                  (VkCommandBuffer commandBuffer, VkAccelerationStructureNV dst, VkAccelerationStructureNV src, VkCopyAccelerationStructureModeKHR mode) const;
-virtual void                           cmdTraceRaysNV                                                                  (VkCommandBuffer commandBuffer, VkBuffer raygenShaderBindingTableBuffer, VkDeviceSize raygenShaderBindingOffset, VkBuffer missShaderBindingTableBuffer, VkDeviceSize missShaderBindingOffset, VkDeviceSize missShaderBindingStride, VkBuffer hitShaderBindingTableBuffer, VkDeviceSize hitShaderBindingOffset, VkDeviceSize hitShaderBindingStride, VkBuffer callableShaderBindingTableBuffer, VkDeviceSize callableShaderBindingOffset, VkDeviceSize callableShaderBindingStride, deUint32 width, deUint32 height, deUint32 depth) const;
-virtual VkResult                       createRayTracingPipelinesNV                                             (VkDevice device, VkPipelineCache pipelineCache, deUint32 createInfoCount, const VkRayTracingPipelineCreateInfoNV* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkPipeline* pPipelines) const;
-virtual VkResult                       getRayTracingShaderGroupHandlesKHR                              (VkDevice device, VkPipeline pipeline, deUint32 firstGroup, deUint32 groupCount, deUintptr dataSize, void* pData) const;
-virtual VkResult                       getRayTracingShaderGroupHandlesNV                               (VkDevice device, VkPipeline pipeline, deUint32 firstGroup, deUint32 groupCount, deUintptr dataSize, void* pData) const;
+virtual void                           cmdTraceRaysNV                                                                  (VkCommandBuffer commandBuffer, VkBuffer raygenShaderBindingTableBuffer, VkDeviceSize raygenShaderBindingOffset, VkBuffer missShaderBindingTableBuffer, VkDeviceSize missShaderBindingOffset, VkDeviceSize missShaderBindingStride, VkBuffer hitShaderBindingTableBuffer, VkDeviceSize hitShaderBindingOffset, VkDeviceSize hitShaderBindingStride, VkBuffer callableShaderBindingTableBuffer, VkDeviceSize callableShaderBindingOffset, VkDeviceSize callableShaderBindingStride, uint32_t width, uint32_t height, uint32_t depth) const;
+virtual VkResult                       createRayTracingPipelinesNV                                             (VkDevice device, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkRayTracingPipelineCreateInfoNV* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkPipeline* pPipelines) const;
+virtual VkResult                       getRayTracingShaderGroupHandlesKHR                              (VkDevice device, VkPipeline pipeline, uint32_t firstGroup, uint32_t groupCount, deUintptr dataSize, void* pData) const;
+virtual VkResult                       getRayTracingShaderGroupHandlesNV                               (VkDevice device, VkPipeline pipeline, uint32_t firstGroup, uint32_t groupCount, deUintptr dataSize, void* pData) const;
 virtual VkResult                       getAccelerationStructureHandleNV                                (VkDevice device, VkAccelerationStructureNV accelerationStructure, deUintptr dataSize, void* pData) const;
-virtual void                           cmdWriteAccelerationStructuresPropertiesNV              (VkCommandBuffer commandBuffer, deUint32 accelerationStructureCount, const VkAccelerationStructureNV* pAccelerationStructures, VkQueryType queryType, VkQueryPool queryPool, deUint32 firstQuery) const;
-virtual VkResult                       compileDeferredNV                                                               (VkDevice device, VkPipeline pipeline, deUint32 shader) const;
+virtual void                           cmdWriteAccelerationStructuresPropertiesNV              (VkCommandBuffer commandBuffer, uint32_t accelerationStructureCount, const VkAccelerationStructureNV* pAccelerationStructures, VkQueryType queryType, VkQueryPool queryPool, uint32_t firstQuery) const;
+virtual VkResult                       compileDeferredNV                                                               (VkDevice device, VkPipeline pipeline, uint32_t shader) const;
 virtual VkResult                       getMemoryHostPointerPropertiesEXT                               (VkDevice device, VkExternalMemoryHandleTypeFlagBits handleType, const void* pHostPointer, VkMemoryHostPointerPropertiesEXT* pMemoryHostPointerProperties) const;
-virtual void                           cmdWriteBufferMarkerAMD                                                 (VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkBuffer dstBuffer, VkDeviceSize dstOffset, deUint32 marker) const;
-virtual VkResult                       getCalibratedTimestampsEXT                                              (VkDevice device, deUint32 timestampCount, const VkCalibratedTimestampInfoEXT* pTimestampInfos, deUint64* pTimestamps, deUint64* pMaxDeviation) const;
-virtual void                           cmdDrawMeshTasksNV                                                              (VkCommandBuffer commandBuffer, deUint32 taskCount, deUint32 firstTask) const;
-virtual void                           cmdDrawMeshTasksIndirectNV                                              (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, deUint32 drawCount, deUint32 stride) const;
-virtual void                           cmdDrawMeshTasksIndirectCountNV                                 (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, deUint32 maxDrawCount, deUint32 stride) const;
-virtual void                           cmdSetExclusiveScissorNV                                                (VkCommandBuffer commandBuffer, deUint32 firstExclusiveScissor, deUint32 exclusiveScissorCount, const VkRect2D* pExclusiveScissors) const;
+virtual void                           cmdWriteBufferMarkerAMD                                                 (VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkBuffer dstBuffer, VkDeviceSize dstOffset, uint32_t marker) const;
+virtual VkResult                       getCalibratedTimestampsEXT                                              (VkDevice device, uint32_t timestampCount, const VkCalibratedTimestampInfoEXT* pTimestampInfos, deUint64* pTimestamps, deUint64* pMaxDeviation) const;
+virtual void                           cmdDrawMeshTasksNV                                                              (VkCommandBuffer commandBuffer, uint32_t taskCount, uint32_t firstTask) const;
+virtual void                           cmdDrawMeshTasksIndirectNV                                              (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride) const;
+virtual void                           cmdDrawMeshTasksIndirectCountNV                                 (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride) const;
+virtual void                           cmdSetExclusiveScissorNV                                                (VkCommandBuffer commandBuffer, uint32_t firstExclusiveScissor, uint32_t exclusiveScissorCount, const VkRect2D* pExclusiveScissors) const;
 virtual void                           cmdSetCheckpointNV                                                              (VkCommandBuffer commandBuffer, const void* pCheckpointMarker) const;
-virtual void                           getQueueCheckpointDataNV                                                (VkQueue queue, deUint32* pCheckpointDataCount, VkCheckpointDataNV* pCheckpointData) const;
+virtual void                           getQueueCheckpointDataNV                                                (VkQueue queue, uint32_t* pCheckpointDataCount, VkCheckpointDataNV* pCheckpointData) const;
 virtual VkResult                       initializePerformanceApiINTEL                                   (VkDevice device, const VkInitializePerformanceApiInfoINTEL* pInitializeInfo) const;
 virtual void                           uninitializePerformanceApiINTEL                                 (VkDevice device) const;
 virtual VkResult                       cmdSetPerformanceMarkerINTEL                                    (VkCommandBuffer commandBuffer, const VkPerformanceMarkerInfoINTEL* pMarkerInfo) const;
@@ -276,13 +276,13 @@ virtual VkResult                  queueSetPerformanceConfigurationINTEL                   (VkQueue queue, VkPer
 virtual VkResult                       getPerformanceParameterINTEL                                    (VkDevice device, VkPerformanceParameterTypeINTEL parameter, VkPerformanceValueINTEL* pValue) const;
 virtual void                           setLocalDimmingAMD                                                              (VkDevice device, VkSwapchainKHR swapChain, VkBool32 localDimmingEnable) const;
 virtual VkDeviceAddress                getBufferDeviceAddressEXT                                               (VkDevice device, const VkBufferDeviceAddressInfo* pInfo) const;
-virtual void                           cmdSetLineStippleEXT                                                    (VkCommandBuffer commandBuffer, deUint32 lineStippleFactor, deUint16 lineStipplePattern) const;
+virtual void                           cmdSetLineStippleEXT                                                    (VkCommandBuffer commandBuffer, uint32_t lineStippleFactor, deUint16 lineStipplePattern) const;
 virtual void                           cmdSetCullModeEXT                                                               (VkCommandBuffer commandBuffer, VkCullModeFlags cullMode) const;
 virtual void                           cmdSetFrontFaceEXT                                                              (VkCommandBuffer commandBuffer, VkFrontFace frontFace) const;
 virtual void                           cmdSetPrimitiveTopologyEXT                                              (VkCommandBuffer commandBuffer, VkPrimitiveTopology primitiveTopology) const;
-virtual void                           cmdSetViewportWithCountEXT                                              (VkCommandBuffer commandBuffer, deUint32 viewportCount, const VkViewport* pViewports) const;
-virtual void                           cmdSetScissorWithCountEXT                                               (VkCommandBuffer commandBuffer, deUint32 scissorCount, const VkRect2D* pScissors) const;
-virtual void                           cmdBindVertexBuffers2EXT                                                (VkCommandBuffer commandBuffer, deUint32 firstBinding, deUint32 bindingCount, const VkBuffer* pBuffers, const VkDeviceSize* pOffsets, const VkDeviceSize* pSizes, const VkDeviceSize* pStrides) const;
+virtual void                           cmdSetViewportWithCountEXT                                              (VkCommandBuffer commandBuffer, uint32_t viewportCount, const VkViewport* pViewports) const;
+virtual void                           cmdSetScissorWithCountEXT                                               (VkCommandBuffer commandBuffer, uint32_t scissorCount, const VkRect2D* pScissors) const;
+virtual void                           cmdBindVertexBuffers2EXT                                                (VkCommandBuffer commandBuffer, uint32_t firstBinding, uint32_t bindingCount, const VkBuffer* pBuffers, const VkDeviceSize* pOffsets, const VkDeviceSize* pSizes, const VkDeviceSize* pStrides) const;
 virtual void                           cmdSetDepthTestEnableEXT                                                (VkCommandBuffer commandBuffer, VkBool32 depthTestEnable) const;
 virtual void                           cmdSetDepthWriteEnableEXT                                               (VkCommandBuffer commandBuffer, VkBool32 depthWriteEnable) const;
 virtual void                           cmdSetDepthCompareOpEXT                                                 (VkCommandBuffer commandBuffer, VkCompareOp depthCompareOp) const;
@@ -292,7 +292,7 @@ virtual void                                cmdSetStencilOpEXT                                                              (VkCommandBuffer commandBuffer, VkSten
 virtual void                           getGeneratedCommandsMemoryRequirementsNV                (VkDevice device, const VkGeneratedCommandsMemoryRequirementsInfoNV* pInfo, VkMemoryRequirements2* pMemoryRequirements) const;
 virtual void                           cmdPreprocessGeneratedCommandsNV                                (VkCommandBuffer commandBuffer, const VkGeneratedCommandsInfoNV* pGeneratedCommandsInfo) const;
 virtual void                           cmdExecuteGeneratedCommandsNV                                   (VkCommandBuffer commandBuffer, VkBool32 isPreprocessed, const VkGeneratedCommandsInfoNV* pGeneratedCommandsInfo) const;
-virtual void                           cmdBindPipelineShaderGroupNV                                    (VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline pipeline, deUint32 groupIndex) const;
+virtual void                           cmdBindPipelineShaderGroupNV                                    (VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline pipeline, uint32_t groupIndex) const;
 virtual VkResult                       createIndirectCommandsLayoutNV                                  (VkDevice device, const VkIndirectCommandsLayoutCreateInfoNV* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkIndirectCommandsLayoutNV* pIndirectCommandsLayout) const;
 virtual void                           destroyIndirectCommandsLayoutNV                                 (VkDevice device, VkIndirectCommandsLayoutNV indirectCommandsLayout, const VkAllocationCallbacks* pAllocator) const;
 virtual VkResult                       createPrivateDataSlotEXT                                                (VkDevice device, const VkPrivateDataSlotCreateInfoEXT* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkPrivateDataSlotEXT* pPrivateDataSlot) const;
@@ -300,46 +300,46 @@ virtual void                              destroyPrivateDataSlotEXT                                               (VkDevice device, VkPrivateDataSl
 virtual VkResult                       setPrivateDataEXT                                                               (VkDevice device, VkObjectType objectType, deUint64 objectHandle, VkPrivateDataSlotEXT privateDataSlot, deUint64 data) const;
 virtual void                           getPrivateDataEXT                                                               (VkDevice device, VkObjectType objectType, deUint64 objectHandle, VkPrivateDataSlotEXT privateDataSlot, deUint64* pData) const;
 virtual void                           cmdSetFragmentShadingRateEnumNV                                 (VkCommandBuffer commandBuffer, VkFragmentShadingRateNV shadingRate, const VkFragmentShadingRateCombinerOpKHR combinerOps[2]) const;
-virtual void                           cmdSetVertexInputEXT                                                    (VkCommandBuffer commandBuffer, deUint32 vertexBindingDescriptionCount, const VkVertexInputBindingDescription2EXT* pVertexBindingDescriptions, deUint32 vertexAttributeDescriptionCount, const VkVertexInputAttributeDescription2EXT* pVertexAttributeDescriptions) const;
+virtual void                           cmdSetVertexInputEXT                                                    (VkCommandBuffer commandBuffer, uint32_t vertexBindingDescriptionCount, const VkVertexInputBindingDescription2EXT* pVertexBindingDescriptions, uint32_t vertexAttributeDescriptionCount, const VkVertexInputAttributeDescription2EXT* pVertexAttributeDescriptions) const;
 virtual VkResult                       getDeviceSubpassShadingMaxWorkgroupSizeHUAWEI   (VkDevice device, VkRenderPass renderpass, VkExtent2D* pMaxWorkgroupSize) const;
 virtual void                           cmdSubpassShadingHUAWEI                                                 (VkCommandBuffer commandBuffer) const;
 virtual VkResult                       getMemoryRemoteAddressNV                                                (VkDevice device, const VkMemoryGetRemoteAddressInfoNV* getMemoryRemoteAddressInfo, VkRemoteAddressNV* pAddress) const;
-virtual void                           cmdSetPatchControlPointsEXT                                             (VkCommandBuffer commandBuffer, deUint32 patchControlPoints) const;
+virtual void                           cmdSetPatchControlPointsEXT                                             (VkCommandBuffer commandBuffer, uint32_t patchControlPoints) const;
 virtual void                           cmdSetRasterizerDiscardEnableEXT                                (VkCommandBuffer commandBuffer, VkBool32 rasterizerDiscardEnable) const;
 virtual void                           cmdSetDepthBiasEnableEXT                                                (VkCommandBuffer commandBuffer, VkBool32 depthBiasEnable) const;
 virtual void                           cmdSetLogicOpEXT                                                                (VkCommandBuffer commandBuffer, VkLogicOp logicOp) const;
 virtual void                           cmdSetPrimitiveRestartEnableEXT                                 (VkCommandBuffer commandBuffer, VkBool32 primitiveRestartEnable) const;
-virtual void                           cmdSetColorWriteEnableEXT                                               (VkCommandBuffer commandBuffer, deUint32 attachmentCount, const VkBool32* pColorWriteEnables) const;
-virtual void                           cmdDrawMultiEXT                                                                 (VkCommandBuffer commandBuffer, deUint32 drawCount, const VkMultiDrawInfoEXT* pVertexInfo, deUint32 instanceCount, deUint32 firstInstance, deUint32 stride) const;
-virtual void                           cmdDrawMultiIndexedEXT                                                  (VkCommandBuffer commandBuffer, deUint32 drawCount, const VkMultiDrawIndexedInfoEXT* pIndexInfo, deUint32 instanceCount, deUint32 firstInstance, deUint32 stride, const deInt32* pVertexOffset) const;
+virtual void                           cmdSetColorWriteEnableEXT                                               (VkCommandBuffer commandBuffer, uint32_t attachmentCount, const VkBool32* pColorWriteEnables) const;
+virtual void                           cmdDrawMultiEXT                                                                 (VkCommandBuffer commandBuffer, uint32_t drawCount, const VkMultiDrawInfoEXT* pVertexInfo, uint32_t instanceCount, uint32_t firstInstance, uint32_t stride) const;
+virtual void                           cmdDrawMultiIndexedEXT                                                  (VkCommandBuffer commandBuffer, uint32_t drawCount, const VkMultiDrawIndexedInfoEXT* pIndexInfo, uint32_t instanceCount, uint32_t firstInstance, uint32_t stride, const int32_t* pVertexOffset) const;
 virtual VkResult                       createAccelerationStructureKHR                                  (VkDevice device, const VkAccelerationStructureCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkAccelerationStructureKHR* pAccelerationStructure) const;
 virtual void                           destroyAccelerationStructureKHR                                 (VkDevice device, VkAccelerationStructureKHR accelerationStructure, const VkAllocationCallbacks* pAllocator) const;
-virtual void                           cmdBuildAccelerationStructuresKHR                               (VkCommandBuffer commandBuffer, deUint32 infoCount, const VkAccelerationStructureBuildGeometryInfoKHR* pInfos, const VkAccelerationStructureBuildRangeInfoKHR* const* ppBuildRangeInfos) const;
-virtual void                           cmdBuildAccelerationStructuresIndirectKHR               (VkCommandBuffer commandBuffer, deUint32 infoCount, const VkAccelerationStructureBuildGeometryInfoKHR* pInfos, const VkDeviceAddress* pIndirectDeviceAddresses, const deUint32* pIndirectStrides, const deUint32* const* ppMaxPrimitiveCounts) const;
-virtual VkResult                       buildAccelerationStructuresKHR                                  (VkDevice device, VkDeferredOperationKHR deferredOperation, deUint32 infoCount, const VkAccelerationStructureBuildGeometryInfoKHR* pInfos, const VkAccelerationStructureBuildRangeInfoKHR* const* ppBuildRangeInfos) const;
+virtual void                           cmdBuildAccelerationStructuresKHR                               (VkCommandBuffer commandBuffer, uint32_t infoCount, const VkAccelerationStructureBuildGeometryInfoKHR* pInfos, const VkAccelerationStructureBuildRangeInfoKHR* const* ppBuildRangeInfos) const;
+virtual void                           cmdBuildAccelerationStructuresIndirectKHR               (VkCommandBuffer commandBuffer, uint32_t infoCount, const VkAccelerationStructureBuildGeometryInfoKHR* pInfos, const VkDeviceAddress* pIndirectDeviceAddresses, const uint32_t* pIndirectStrides, const uint32_t* const* ppMaxPrimitiveCounts) const;
+virtual VkResult                       buildAccelerationStructuresKHR                                  (VkDevice device, VkDeferredOperationKHR deferredOperation, uint32_t infoCount, const VkAccelerationStructureBuildGeometryInfoKHR* pInfos, const VkAccelerationStructureBuildRangeInfoKHR* const* ppBuildRangeInfos) const;
 virtual VkResult                       copyAccelerationStructureKHR                                    (VkDevice device, VkDeferredOperationKHR deferredOperation, const VkCopyAccelerationStructureInfoKHR* pInfo) const;
 virtual VkResult                       copyAccelerationStructureToMemoryKHR                    (VkDevice device, VkDeferredOperationKHR deferredOperation, const VkCopyAccelerationStructureToMemoryInfoKHR* pInfo) const;
 virtual VkResult                       copyMemoryToAccelerationStructureKHR                    (VkDevice device, VkDeferredOperationKHR deferredOperation, const VkCopyMemoryToAccelerationStructureInfoKHR* pInfo) const;
-virtual VkResult                       writeAccelerationStructuresPropertiesKHR                (VkDevice device, deUint32 accelerationStructureCount, const VkAccelerationStructureKHR* pAccelerationStructures, VkQueryType queryType, deUintptr dataSize, void* pData, deUintptr stride) const;
+virtual VkResult                       writeAccelerationStructuresPropertiesKHR                (VkDevice device, uint32_t accelerationStructureCount, const VkAccelerationStructureKHR* pAccelerationStructures, VkQueryType queryType, deUintptr dataSize, void* pData, deUintptr stride) const;
 virtual void                           cmdCopyAccelerationStructureKHR                                 (VkCommandBuffer commandBuffer, const VkCopyAccelerationStructureInfoKHR* pInfo) const;
 virtual void                           cmdCopyAccelerationStructureToMemoryKHR                 (VkCommandBuffer commandBuffer, const VkCopyAccelerationStructureToMemoryInfoKHR* pInfo) const;
 virtual void                           cmdCopyMemoryToAccelerationStructureKHR                 (VkCommandBuffer commandBuffer, const VkCopyMemoryToAccelerationStructureInfoKHR* pInfo) const;
 virtual VkDeviceAddress                getAccelerationStructureDeviceAddressKHR                (VkDevice device, const VkAccelerationStructureDeviceAddressInfoKHR* pInfo) const;
-virtual void                           cmdWriteAccelerationStructuresPropertiesKHR             (VkCommandBuffer commandBuffer, deUint32 accelerationStructureCount, const VkAccelerationStructureKHR* pAccelerationStructures, VkQueryType queryType, VkQueryPool queryPool, deUint32 firstQuery) const;
+virtual void                           cmdWriteAccelerationStructuresPropertiesKHR             (VkCommandBuffer commandBuffer, uint32_t accelerationStructureCount, const VkAccelerationStructureKHR* pAccelerationStructures, VkQueryType queryType, VkQueryPool queryPool, uint32_t firstQuery) const;
 virtual void                           getDeviceAccelerationStructureCompatibilityKHR  (VkDevice device, const VkAccelerationStructureVersionInfoKHR* pVersionInfo, VkAccelerationStructureCompatibilityKHR* pCompatibility) const;
-virtual void                           getAccelerationStructureBuildSizesKHR                   (VkDevice device, VkAccelerationStructureBuildTypeKHR buildType, const VkAccelerationStructureBuildGeometryInfoKHR* pBuildInfo, const deUint32* pMaxPrimitiveCounts, VkAccelerationStructureBuildSizesInfoKHR* pSizeInfo) const;
-virtual void                           cmdTraceRaysKHR                                                                 (VkCommandBuffer commandBuffer, const VkStridedDeviceAddressRegionKHR* pRaygenShaderBindingTable, const VkStridedDeviceAddressRegionKHR* pMissShaderBindingTable, const VkStridedDeviceAddressRegionKHR* pHitShaderBindingTable, const VkStridedDeviceAddressRegionKHR* pCallableShaderBindingTable, deUint32 width, deUint32 height, deUint32 depth) const;
-virtual VkResult                       createRayTracingPipelinesKHR                                    (VkDevice device, VkDeferredOperationKHR deferredOperation, VkPipelineCache pipelineCache, deUint32 createInfoCount, const VkRayTracingPipelineCreateInfoKHR* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkPipeline* pPipelines) const;
-virtual VkResult                       getRayTracingCaptureReplayShaderGroupHandlesKHR (VkDevice device, VkPipeline pipeline, deUint32 firstGroup, deUint32 groupCount, deUintptr dataSize, void* pData) const;
+virtual void                           getAccelerationStructureBuildSizesKHR                   (VkDevice device, VkAccelerationStructureBuildTypeKHR buildType, const VkAccelerationStructureBuildGeometryInfoKHR* pBuildInfo, const uint32_t* pMaxPrimitiveCounts, VkAccelerationStructureBuildSizesInfoKHR* pSizeInfo) const;
+virtual void                           cmdTraceRaysKHR                                                                 (VkCommandBuffer commandBuffer, const VkStridedDeviceAddressRegionKHR* pRaygenShaderBindingTable, const VkStridedDeviceAddressRegionKHR* pMissShaderBindingTable, const VkStridedDeviceAddressRegionKHR* pHitShaderBindingTable, const VkStridedDeviceAddressRegionKHR* pCallableShaderBindingTable, uint32_t width, uint32_t height, uint32_t depth) const;
+virtual VkResult                       createRayTracingPipelinesKHR                                    (VkDevice device, VkDeferredOperationKHR deferredOperation, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkRayTracingPipelineCreateInfoKHR* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkPipeline* pPipelines) const;
+virtual VkResult                       getRayTracingCaptureReplayShaderGroupHandlesKHR (VkDevice device, VkPipeline pipeline, uint32_t firstGroup, uint32_t groupCount, deUintptr dataSize, void* pData) const;
 virtual void                           cmdTraceRaysIndirectKHR                                                 (VkCommandBuffer commandBuffer, const VkStridedDeviceAddressRegionKHR* pRaygenShaderBindingTable, const VkStridedDeviceAddressRegionKHR* pMissShaderBindingTable, const VkStridedDeviceAddressRegionKHR* pHitShaderBindingTable, const VkStridedDeviceAddressRegionKHR* pCallableShaderBindingTable, VkDeviceAddress indirectDeviceAddress) const;
-virtual VkDeviceSize           getRayTracingShaderGroupStackSizeKHR                    (VkDevice device, VkPipeline pipeline, deUint32 group, VkShaderGroupShaderKHR groupShader) const;
-virtual void                           cmdSetRayTracingPipelineStackSizeKHR                    (VkCommandBuffer commandBuffer, deUint32 pipelineStackSize) const;
+virtual VkDeviceSize           getRayTracingShaderGroupStackSizeKHR                    (VkDevice device, VkPipeline pipeline, uint32_t group, VkShaderGroupShaderKHR groupShader) const;
+virtual void                           cmdSetRayTracingPipelineStackSizeKHR                    (VkCommandBuffer commandBuffer, uint32_t pipelineStackSize) const;
 virtual VkResult                       getAndroidHardwareBufferPropertiesANDROID               (VkDevice device, const struct pt::AndroidHardwareBufferPtr buffer, VkAndroidHardwareBufferPropertiesANDROID* pProperties) const;
 virtual VkResult                       getMemoryAndroidHardwareBufferANDROID                   (VkDevice device, const VkMemoryGetAndroidHardwareBufferInfoANDROID* pInfo, struct pt::AndroidHardwareBufferPtr* pBuffer) const;
 virtual VkResult                       createVideoSessionKHR                                                   (VkDevice device, const VkVideoSessionCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkVideoSessionKHR* pVideoSession) const;
 virtual void                           destroyVideoSessionKHR                                                  (VkDevice device, VkVideoSessionKHR videoSession, const VkAllocationCallbacks* pAllocator) const;
-virtual VkResult                       getVideoSessionMemoryRequirementsKHR                    (VkDevice device, VkVideoSessionKHR videoSession, deUint32* pVideoSessionMemoryRequirementsCount, VkVideoGetMemoryPropertiesKHR* pVideoSessionMemoryRequirements) const;
-virtual VkResult                       bindVideoSessionMemoryKHR                                               (VkDevice device, VkVideoSessionKHR videoSession, deUint32 videoSessionBindMemoryCount, const VkVideoBindMemoryKHR* pVideoSessionBindMemories) const;
+virtual VkResult                       getVideoSessionMemoryRequirementsKHR                    (VkDevice device, VkVideoSessionKHR videoSession, uint32_t* pVideoSessionMemoryRequirementsCount, VkVideoGetMemoryPropertiesKHR* pVideoSessionMemoryRequirements) const;
+virtual VkResult                       bindVideoSessionMemoryKHR                                               (VkDevice device, VkVideoSessionKHR videoSession, uint32_t videoSessionBindMemoryCount, const VkVideoBindMemoryKHR* pVideoSessionBindMemories) const;
 virtual VkResult                       createVideoSessionParametersKHR                                 (VkDevice device, const VkVideoSessionParametersCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkVideoSessionParametersKHR* pVideoSessionParameters) const;
 virtual VkResult                       updateVideoSessionParametersKHR                                 (VkDevice device, VkVideoSessionParametersKHR videoSessionParameters, const VkVideoSessionParametersUpdateInfoKHR* pUpdateInfo) const;
 virtual void                           destroyVideoSessionParametersKHR                                (VkDevice device, VkVideoSessionParametersKHR videoSessionParameters, const VkAllocationCallbacks* pAllocator) const;
index be58cf7..4f97879 100644 (file)
@@ -2,53 +2,53 @@
  * be lost! Modify the generating script instead.
  */
 virtual void           destroyInstance                                                                                                 (VkInstance instance, const VkAllocationCallbacks* pAllocator) const;
-virtual VkResult       enumeratePhysicalDevices                                                                                (VkInstance instance, deUint32* pPhysicalDeviceCount, VkPhysicalDevice* pPhysicalDevices) const;
+virtual VkResult       enumeratePhysicalDevices                                                                                (VkInstance instance, uint32_t* pPhysicalDeviceCount, VkPhysicalDevice* pPhysicalDevices) const;
 virtual void           getPhysicalDeviceFeatures                                                                               (VkPhysicalDevice physicalDevice, VkPhysicalDeviceFeatures* pFeatures) const;
 virtual void           getPhysicalDeviceFormatProperties                                                               (VkPhysicalDevice physicalDevice, VkFormat format, VkFormatProperties* pFormatProperties) const;
 virtual VkResult       getPhysicalDeviceImageFormatProperties                                                  (VkPhysicalDevice physicalDevice, VkFormat format, VkImageType type, VkImageTiling tiling, VkImageUsageFlags usage, VkImageCreateFlags flags, VkImageFormatProperties* pImageFormatProperties) const;
 virtual void           getPhysicalDeviceProperties                                                                             (VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties* pProperties) const;
-virtual void           getPhysicalDeviceQueueFamilyProperties                                                  (VkPhysicalDevice physicalDevice, deUint32* pQueueFamilyPropertyCount, VkQueueFamilyProperties* pQueueFamilyProperties) const;
+virtual void           getPhysicalDeviceQueueFamilyProperties                                                  (VkPhysicalDevice physicalDevice, uint32_t* pQueueFamilyPropertyCount, VkQueueFamilyProperties* pQueueFamilyProperties) const;
 virtual void           getPhysicalDeviceMemoryProperties                                                               (VkPhysicalDevice physicalDevice, VkPhysicalDeviceMemoryProperties* pMemoryProperties) const;
 virtual VkResult       createDevice                                                                                                    (VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkDevice* pDevice) const;
-virtual VkResult       enumerateDeviceExtensionProperties                                                              (VkPhysicalDevice physicalDevice, const char* pLayerName, deUint32* pPropertyCount, VkExtensionProperties* pProperties) const;
-virtual VkResult       enumerateDeviceLayerProperties                                                                  (VkPhysicalDevice physicalDevice, deUint32* pPropertyCount, VkLayerProperties* pProperties) const;
-virtual void           getPhysicalDeviceSparseImageFormatProperties                                    (VkPhysicalDevice physicalDevice, VkFormat format, VkImageType type, VkSampleCountFlagBits samples, VkImageUsageFlags usage, VkImageTiling tiling, deUint32* pPropertyCount, VkSparseImageFormatProperties* pProperties) const;
-virtual VkResult       enumeratePhysicalDeviceGroups                                                                   (VkInstance instance, deUint32* pPhysicalDeviceGroupCount, VkPhysicalDeviceGroupProperties* pPhysicalDeviceGroupProperties) const;
+virtual VkResult       enumerateDeviceExtensionProperties                                                              (VkPhysicalDevice physicalDevice, const char* pLayerName, uint32_t* pPropertyCount, VkExtensionProperties* pProperties) const;
+virtual VkResult       enumerateDeviceLayerProperties                                                                  (VkPhysicalDevice physicalDevice, uint32_t* pPropertyCount, VkLayerProperties* pProperties) const;
+virtual void           getPhysicalDeviceSparseImageFormatProperties                                    (VkPhysicalDevice physicalDevice, VkFormat format, VkImageType type, VkSampleCountFlagBits samples, VkImageUsageFlags usage, VkImageTiling tiling, uint32_t* pPropertyCount, VkSparseImageFormatProperties* pProperties) const;
+virtual VkResult       enumeratePhysicalDeviceGroups                                                                   (VkInstance instance, uint32_t* pPhysicalDeviceGroupCount, VkPhysicalDeviceGroupProperties* pPhysicalDeviceGroupProperties) const;
 virtual void           getPhysicalDeviceFeatures2                                                                              (VkPhysicalDevice physicalDevice, VkPhysicalDeviceFeatures2* pFeatures) const;
 virtual void           getPhysicalDeviceProperties2                                                                    (VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2* pProperties) const;
 virtual void           getPhysicalDeviceFormatProperties2                                                              (VkPhysicalDevice physicalDevice, VkFormat format, VkFormatProperties2* pFormatProperties) const;
 virtual VkResult       getPhysicalDeviceImageFormatProperties2                                                 (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2* pImageFormatInfo, VkImageFormatProperties2* pImageFormatProperties) const;
-virtual void           getPhysicalDeviceQueueFamilyProperties2                                                 (VkPhysicalDevice physicalDevice, deUint32* pQueueFamilyPropertyCount, VkQueueFamilyProperties2* pQueueFamilyProperties) const;
+virtual void           getPhysicalDeviceQueueFamilyProperties2                                                 (VkPhysicalDevice physicalDevice, uint32_t* pQueueFamilyPropertyCount, VkQueueFamilyProperties2* pQueueFamilyProperties) const;
 virtual void           getPhysicalDeviceMemoryProperties2                                                              (VkPhysicalDevice physicalDevice, VkPhysicalDeviceMemoryProperties2* pMemoryProperties) const;
-virtual void           getPhysicalDeviceSparseImageFormatProperties2                                   (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSparseImageFormatInfo2* pFormatInfo, deUint32* pPropertyCount, VkSparseImageFormatProperties2* pProperties) const;
+virtual void           getPhysicalDeviceSparseImageFormatProperties2                                   (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSparseImageFormatInfo2* pFormatInfo, uint32_t* pPropertyCount, VkSparseImageFormatProperties2* pProperties) const;
 virtual void           getPhysicalDeviceExternalBufferProperties                                               (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalBufferInfo* pExternalBufferInfo, VkExternalBufferProperties* pExternalBufferProperties) const;
 virtual void           getPhysicalDeviceExternalFenceProperties                                                (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalFenceInfo* pExternalFenceInfo, VkExternalFenceProperties* pExternalFenceProperties) const;
 virtual void           getPhysicalDeviceExternalSemaphoreProperties                                    (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalSemaphoreInfo* pExternalSemaphoreInfo, VkExternalSemaphoreProperties* pExternalSemaphoreProperties) const;
 virtual void           destroySurfaceKHR                                                                                               (VkInstance instance, VkSurfaceKHR surface, const VkAllocationCallbacks* pAllocator) const;
-virtual VkResult       getPhysicalDeviceSurfaceSupportKHR                                                              (VkPhysicalDevice physicalDevice, deUint32 queueFamilyIndex, VkSurfaceKHR surface, VkBool32* pSupported) const;
+virtual VkResult       getPhysicalDeviceSurfaceSupportKHR                                                              (VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, VkSurfaceKHR surface, VkBool32* pSupported) const;
 virtual VkResult       getPhysicalDeviceSurfaceCapabilitiesKHR                                                 (VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, VkSurfaceCapabilitiesKHR* pSurfaceCapabilities) const;
-virtual VkResult       getPhysicalDeviceSurfaceFormatsKHR                                                              (VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, deUint32* pSurfaceFormatCount, VkSurfaceFormatKHR* pSurfaceFormats) const;
-virtual VkResult       getPhysicalDeviceSurfacePresentModesKHR                                                 (VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, deUint32* pPresentModeCount, VkPresentModeKHR* pPresentModes) const;
-virtual VkResult       getPhysicalDevicePresentRectanglesKHR                                                   (VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, deUint32* pRectCount, VkRect2D* pRects) const;
-virtual VkResult       getPhysicalDeviceDisplayPropertiesKHR                                                   (VkPhysicalDevice physicalDevice, deUint32* pPropertyCount, VkDisplayPropertiesKHR* pProperties) const;
-virtual VkResult       getPhysicalDeviceDisplayPlanePropertiesKHR                                              (VkPhysicalDevice physicalDevice, deUint32* pPropertyCount, VkDisplayPlanePropertiesKHR* pProperties) const;
-virtual VkResult       getDisplayPlaneSupportedDisplaysKHR                                                             (VkPhysicalDevice physicalDevice, deUint32 planeIndex, deUint32* pDisplayCount, VkDisplayKHR* pDisplays) const;
-virtual VkResult       getDisplayModePropertiesKHR                                                                             (VkPhysicalDevice physicalDevice, VkDisplayKHR display, deUint32* pPropertyCount, VkDisplayModePropertiesKHR* pProperties) const;
+virtual VkResult       getPhysicalDeviceSurfaceFormatsKHR                                                              (VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, uint32_t* pSurfaceFormatCount, VkSurfaceFormatKHR* pSurfaceFormats) const;
+virtual VkResult       getPhysicalDeviceSurfacePresentModesKHR                                                 (VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, uint32_t* pPresentModeCount, VkPresentModeKHR* pPresentModes) const;
+virtual VkResult       getPhysicalDevicePresentRectanglesKHR                                                   (VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, uint32_t* pRectCount, VkRect2D* pRects) const;
+virtual VkResult       getPhysicalDeviceDisplayPropertiesKHR                                                   (VkPhysicalDevice physicalDevice, uint32_t* pPropertyCount, VkDisplayPropertiesKHR* pProperties) const;
+virtual VkResult       getPhysicalDeviceDisplayPlanePropertiesKHR                                              (VkPhysicalDevice physicalDevice, uint32_t* pPropertyCount, VkDisplayPlanePropertiesKHR* pProperties) const;
+virtual VkResult       getDisplayPlaneSupportedDisplaysKHR                                                             (VkPhysicalDevice physicalDevice, uint32_t planeIndex, uint32_t* pDisplayCount, VkDisplayKHR* pDisplays) const;
+virtual VkResult       getDisplayModePropertiesKHR                                                                             (VkPhysicalDevice physicalDevice, VkDisplayKHR display, uint32_t* pPropertyCount, VkDisplayModePropertiesKHR* pProperties) const;
 virtual VkResult       createDisplayModeKHR                                                                                    (VkPhysicalDevice physicalDevice, VkDisplayKHR display, const VkDisplayModeCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkDisplayModeKHR* pMode) const;
-virtual VkResult       getDisplayPlaneCapabilitiesKHR                                                                  (VkPhysicalDevice physicalDevice, VkDisplayModeKHR mode, deUint32 planeIndex, VkDisplayPlaneCapabilitiesKHR* pCapabilities) const;
+virtual VkResult       getDisplayPlaneCapabilitiesKHR                                                                  (VkPhysicalDevice physicalDevice, VkDisplayModeKHR mode, uint32_t planeIndex, VkDisplayPlaneCapabilitiesKHR* pCapabilities) const;
 virtual VkResult       createDisplayPlaneSurfaceKHR                                                                    (VkInstance instance, const VkDisplaySurfaceCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface) const;
-virtual VkResult       enumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR   (VkPhysicalDevice physicalDevice, deUint32 queueFamilyIndex, deUint32* pCounterCount, VkPerformanceCounterKHR* pCounters, VkPerformanceCounterDescriptionKHR* pCounterDescriptions) const;
-virtual void           getPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR                   (VkPhysicalDevice physicalDevice, const VkQueryPoolPerformanceCreateInfoKHR* pPerformanceQueryCreateInfo, deUint32* pNumPasses) const;
+virtual VkResult       enumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR   (VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, uint32_t* pCounterCount, VkPerformanceCounterKHR* pCounters, VkPerformanceCounterDescriptionKHR* pCounterDescriptions) const;
+virtual void           getPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR                   (VkPhysicalDevice physicalDevice, const VkQueryPoolPerformanceCreateInfoKHR* pPerformanceQueryCreateInfo, uint32_t* pNumPasses) const;
 virtual VkResult       getPhysicalDeviceSurfaceCapabilities2KHR                                                (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo, VkSurfaceCapabilities2KHR* pSurfaceCapabilities) const;
-virtual VkResult       getPhysicalDeviceSurfaceFormats2KHR                                                             (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo, deUint32* pSurfaceFormatCount, VkSurfaceFormat2KHR* pSurfaceFormats) const;
-virtual VkResult       getPhysicalDeviceDisplayProperties2KHR                                                  (VkPhysicalDevice physicalDevice, deUint32* pPropertyCount, VkDisplayProperties2KHR* pProperties) const;
-virtual VkResult       getPhysicalDeviceDisplayPlaneProperties2KHR                                             (VkPhysicalDevice physicalDevice, deUint32* pPropertyCount, VkDisplayPlaneProperties2KHR* pProperties) const;
-virtual VkResult       getDisplayModeProperties2KHR                                                                    (VkPhysicalDevice physicalDevice, VkDisplayKHR display, deUint32* pPropertyCount, VkDisplayModeProperties2KHR* pProperties) const;
+virtual VkResult       getPhysicalDeviceSurfaceFormats2KHR                                                             (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo, uint32_t* pSurfaceFormatCount, VkSurfaceFormat2KHR* pSurfaceFormats) const;
+virtual VkResult       getPhysicalDeviceDisplayProperties2KHR                                                  (VkPhysicalDevice physicalDevice, uint32_t* pPropertyCount, VkDisplayProperties2KHR* pProperties) const;
+virtual VkResult       getPhysicalDeviceDisplayPlaneProperties2KHR                                             (VkPhysicalDevice physicalDevice, uint32_t* pPropertyCount, VkDisplayPlaneProperties2KHR* pProperties) const;
+virtual VkResult       getDisplayModeProperties2KHR                                                                    (VkPhysicalDevice physicalDevice, VkDisplayKHR display, uint32_t* pPropertyCount, VkDisplayModeProperties2KHR* pProperties) const;
 virtual VkResult       getDisplayPlaneCapabilities2KHR                                                                 (VkPhysicalDevice physicalDevice, const VkDisplayPlaneInfo2KHR* pDisplayPlaneInfo, VkDisplayPlaneCapabilities2KHR* pCapabilities) const;
-virtual VkResult       getPhysicalDeviceFragmentShadingRatesKHR                                                (VkPhysicalDevice physicalDevice, deUint32* pFragmentShadingRateCount, VkPhysicalDeviceFragmentShadingRateKHR* pFragmentShadingRates) const;
+virtual VkResult       getPhysicalDeviceFragmentShadingRatesKHR                                                (VkPhysicalDevice physicalDevice, uint32_t* pFragmentShadingRateCount, VkPhysicalDeviceFragmentShadingRateKHR* pFragmentShadingRates) const;
 virtual VkResult       createDebugReportCallbackEXT                                                                    (VkInstance instance, const VkDebugReportCallbackCreateInfoEXT* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkDebugReportCallbackEXT* pCallback) const;
 virtual void           destroyDebugReportCallbackEXT                                                                   (VkInstance instance, VkDebugReportCallbackEXT callback, const VkAllocationCallbacks* pAllocator) const;
-virtual void           debugReportMessageEXT                                                                                   (VkInstance instance, VkDebugReportFlagsEXT flags, VkDebugReportObjectTypeEXT objectType, deUint64 object, deUintptr location, deInt32 messageCode, const char* pLayerPrefix, const char* pMessage) const;
+virtual void           debugReportMessageEXT                                                                                   (VkInstance instance, VkDebugReportFlagsEXT flags, VkDebugReportObjectTypeEXT objectType, deUint64 object, deUintptr location, int32_t messageCode, const char* pLayerPrefix, const char* pMessage) const;
 virtual VkResult       getPhysicalDeviceExternalImageFormatPropertiesNV                                (VkPhysicalDevice physicalDevice, VkFormat format, VkImageType type, VkImageTiling tiling, VkImageUsageFlags usage, VkImageCreateFlags flags, VkExternalMemoryHandleTypeFlagsNV externalHandleType, VkExternalImageFormatPropertiesNV* pExternalImageFormatProperties) const;
 virtual VkResult       releaseDisplayEXT                                                                                               (VkPhysicalDevice physicalDevice, VkDisplayKHR display) const;
 virtual VkResult       getPhysicalDeviceSurfaceCapabilities2EXT                                                (VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, VkSurfaceCapabilities2EXT* pSurfaceCapabilities) const;
@@ -56,18 +56,18 @@ virtual VkResult    createDebugUtilsMessengerEXT                                                                    (VkInstance instance, cons
 virtual void           destroyDebugUtilsMessengerEXT                                                                   (VkInstance instance, VkDebugUtilsMessengerEXT messenger, const VkAllocationCallbacks* pAllocator) const;
 virtual void           submitDebugUtilsMessageEXT                                                                              (VkInstance instance, VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity, VkDebugUtilsMessageTypeFlagsEXT messageTypes, const VkDebugUtilsMessengerCallbackDataEXT* pCallbackData) const;
 virtual void           getPhysicalDeviceMultisamplePropertiesEXT                                               (VkPhysicalDevice physicalDevice, VkSampleCountFlagBits samples, VkMultisamplePropertiesEXT* pMultisampleProperties) const;
-virtual VkResult       getPhysicalDeviceCalibrateableTimeDomainsEXT                                    (VkPhysicalDevice physicalDevice, deUint32* pTimeDomainCount, VkTimeDomainEXT* pTimeDomains) const;
-virtual VkResult       getPhysicalDeviceToolPropertiesEXT                                                              (VkPhysicalDevice physicalDevice, deUint32* pToolCount, VkPhysicalDeviceToolPropertiesEXT* pToolProperties) const;
-virtual VkResult       getPhysicalDeviceCooperativeMatrixPropertiesNV                                  (VkPhysicalDevice physicalDevice, deUint32* pPropertyCount, VkCooperativeMatrixPropertiesNV* pProperties) const;
-virtual VkResult       getPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV (VkPhysicalDevice physicalDevice, deUint32* pCombinationCount, VkFramebufferMixedSamplesCombinationNV* pCombinations) const;
+virtual VkResult       getPhysicalDeviceCalibrateableTimeDomainsEXT                                    (VkPhysicalDevice physicalDevice, uint32_t* pTimeDomainCount, VkTimeDomainEXT* pTimeDomains) const;
+virtual VkResult       getPhysicalDeviceToolPropertiesEXT                                                              (VkPhysicalDevice physicalDevice, uint32_t* pToolCount, VkPhysicalDeviceToolPropertiesEXT* pToolProperties) const;
+virtual VkResult       getPhysicalDeviceCooperativeMatrixPropertiesNV                                  (VkPhysicalDevice physicalDevice, uint32_t* pPropertyCount, VkCooperativeMatrixPropertiesNV* pProperties) const;
+virtual VkResult       getPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV (VkPhysicalDevice physicalDevice, uint32_t* pCombinationCount, VkFramebufferMixedSamplesCombinationNV* pCombinations) const;
 virtual VkResult       createHeadlessSurfaceEXT                                                                                (VkInstance instance, const VkHeadlessSurfaceCreateInfoEXT* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface) const;
-virtual VkResult       acquireDrmDisplayEXT                                                                                    (VkPhysicalDevice physicalDevice, deInt32 drmFd, VkDisplayKHR display) const;
-virtual VkResult       getDrmDisplayEXT                                                                                                (VkPhysicalDevice physicalDevice, deInt32 drmFd, deUint32 connectorId, VkDisplayKHR* display) const;
+virtual VkResult       acquireDrmDisplayEXT                                                                                    (VkPhysicalDevice physicalDevice, int32_t drmFd, VkDisplayKHR display) const;
+virtual VkResult       getDrmDisplayEXT                                                                                                (VkPhysicalDevice physicalDevice, int32_t drmFd, uint32_t connectorId, VkDisplayKHR* display) const;
 virtual VkResult       acquireWinrtDisplayNV                                                                                   (VkPhysicalDevice physicalDevice, VkDisplayKHR display) const;
-virtual VkResult       getWinrtDisplayNV                                                                                               (VkPhysicalDevice physicalDevice, deUint32 deviceRelativeId, VkDisplayKHR* pDisplay) const;
+virtual VkResult       getWinrtDisplayNV                                                                                               (VkPhysicalDevice physicalDevice, uint32_t deviceRelativeId, VkDisplayKHR* pDisplay) const;
 virtual VkResult       createAndroidSurfaceKHR                                                                                 (VkInstance instance, const VkAndroidSurfaceCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface) const;
 virtual VkResult       getPhysicalDeviceVideoCapabilitiesKHR                                                   (VkPhysicalDevice physicalDevice, const VkVideoProfileKHR* pVideoProfile, VkVideoCapabilitiesKHR* pCapabilities) const;
-virtual VkResult       getPhysicalDeviceVideoFormatPropertiesKHR                                               (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceVideoFormatInfoKHR* pVideoFormatInfo, deUint32* pVideoFormatPropertyCount, VkVideoFormatPropertiesKHR* pVideoFormatProperties) const;
+virtual VkResult       getPhysicalDeviceVideoFormatPropertiesKHR                                               (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceVideoFormatInfoKHR* pVideoFormatInfo, uint32_t* pVideoFormatPropertyCount, VkVideoFormatPropertiesKHR* pVideoFormatProperties) const;
 virtual VkResult       createImagePipeSurfaceFUCHSIA                                                                   (VkInstance instance, const VkImagePipeSurfaceCreateInfoFUCHSIA* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface) const;
 virtual VkResult       createStreamDescriptorSurfaceGGP                                                                (VkInstance instance, const VkStreamDescriptorSurfaceCreateInfoGGP* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface) const;
 virtual VkResult       createIOSSurfaceMVK                                                                                             (VkInstance instance, const VkIOSSurfaceCreateInfoMVK* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface) const;
@@ -75,13 +75,13 @@ virtual VkResult    createMacOSSurfaceMVK                                                                                   (VkInstance instance, const VkM
 virtual VkResult       createMetalSurfaceEXT                                                                                   (VkInstance instance, const VkMetalSurfaceCreateInfoEXT* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface) const;
 virtual VkResult       createViSurfaceNN                                                                                               (VkInstance instance, const VkViSurfaceCreateInfoNN* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface) const;
 virtual VkResult       createWaylandSurfaceKHR                                                                                 (VkInstance instance, const VkWaylandSurfaceCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface) const;
-virtual VkBool32       getPhysicalDeviceWaylandPresentationSupportKHR                                  (VkPhysicalDevice physicalDevice, deUint32 queueFamilyIndex, pt::WaylandDisplayPtr display) const;
+virtual VkBool32       getPhysicalDeviceWaylandPresentationSupportKHR                                  (VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, pt::WaylandDisplayPtr display) const;
 virtual VkResult       createWin32SurfaceKHR                                                                                   (VkInstance instance, const VkWin32SurfaceCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface) const;
-virtual VkBool32       getPhysicalDeviceWin32PresentationSupportKHR                                    (VkPhysicalDevice physicalDevice, deUint32 queueFamilyIndex) const;
-virtual VkResult       getPhysicalDeviceSurfacePresentModes2EXT                                                (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo, deUint32* pPresentModeCount, VkPresentModeKHR* pPresentModes) const;
+virtual VkBool32       getPhysicalDeviceWin32PresentationSupportKHR                                    (VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex) const;
+virtual VkResult       getPhysicalDeviceSurfacePresentModes2EXT                                                (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo, uint32_t* pPresentModeCount, VkPresentModeKHR* pPresentModes) const;
 virtual VkResult       createXcbSurfaceKHR                                                                                             (VkInstance instance, const VkXcbSurfaceCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface) const;
-virtual VkBool32       getPhysicalDeviceXcbPresentationSupportKHR                                              (VkPhysicalDevice physicalDevice, deUint32 queueFamilyIndex, pt::XcbConnectionPtr connection, pt::XcbVisualid visual_id) const;
+virtual VkBool32       getPhysicalDeviceXcbPresentationSupportKHR                                              (VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, pt::XcbConnectionPtr connection, pt::XcbVisualid visual_id) const;
 virtual VkResult       createXlibSurfaceKHR                                                                                    (VkInstance instance, const VkXlibSurfaceCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface) const;
-virtual VkBool32       getPhysicalDeviceXlibPresentationSupportKHR                                             (VkPhysicalDevice physicalDevice, deUint32 queueFamilyIndex, pt::XlibDisplayPtr dpy, pt::XlibVisualID visualID) const;
+virtual VkBool32       getPhysicalDeviceXlibPresentationSupportKHR                                             (VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, pt::XlibDisplayPtr dpy, pt::XlibVisualID visualID) const;
 virtual VkResult       acquireXlibDisplayEXT                                                                                   (VkPhysicalDevice physicalDevice, pt::XlibDisplayPtr dpy, VkDisplayKHR display) const;
 virtual VkResult       getRandROutputDisplayEXT                                                                                (VkPhysicalDevice physicalDevice, pt::XlibDisplayPtr dpy, pt::RROutput rrOutput, VkDisplayKHR* pDisplay) const;
index d68dc22..39e65a3 100644 (file)
@@ -3,6 +3,6 @@
  */
 virtual VkResult                       createInstance                                                  (const VkInstanceCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkInstance* pInstance) const;
 virtual PFN_vkVoidFunction     getInstanceProcAddr                                             (VkInstance instance, const char* pName) const;
-virtual VkResult                       enumerateInstanceExtensionProperties    (const char* pLayerName, deUint32* pPropertyCount, VkExtensionProperties* pProperties) const;
-virtual VkResult                       enumerateInstanceLayerProperties                (deUint32* pPropertyCount, VkLayerProperties* pProperties) const;
-virtual VkResult                       enumerateInstanceVersion                                (deUint32* pApiVersion) const;
+virtual VkResult                       enumerateInstanceExtensionProperties    (const char* pLayerName, uint32_t* pPropertyCount, VkExtensionProperties* pProperties) const;
+virtual VkResult                       enumerateInstanceLayerProperties                (uint32_t* pPropertyCount, VkLayerProperties* pProperties) const;
+virtual VkResult                       enumerateInstanceVersion                                (uint32_t* pApiVersion) const;
index 3d19478..1b7b83c 100644 (file)
@@ -11,14 +11,14 @@ enum FunctionOrigin
 
 typedef ::std::pair<const char*, FunctionOrigin> FunctionInfo;
 typedef ::std::vector<FunctionInfo> FunctionInfosList;
-typedef ::std::map<deUint32, FunctionInfosList> ApisMap;
+typedef ::std::map<uint32_t, FunctionInfosList> ApisMap;
 
 void initApisMap (ApisMap& apis)
 {
        apis.clear();
-       apis.insert(::std::pair<deUint32, FunctionInfosList>(VK_API_VERSION_1_0, FunctionInfosList()));
-       apis.insert(::std::pair<deUint32, FunctionInfosList>(VK_API_VERSION_1_1, FunctionInfosList()));
-       apis.insert(::std::pair<deUint32, FunctionInfosList>(VK_API_VERSION_1_2, FunctionInfosList()));
+       apis.insert(::std::pair<uint32_t, FunctionInfosList>(VK_API_VERSION_1_0, FunctionInfosList()));
+       apis.insert(::std::pair<uint32_t, FunctionInfosList>(VK_API_VERSION_1_1, FunctionInfosList()));
+       apis.insert(::std::pair<uint32_t, FunctionInfosList>(VK_API_VERSION_1_2, FunctionInfosList()));
 
        apis[VK_API_VERSION_1_0].push_back(FunctionInfo("vkCreateInstance",                                                                     FUNCTIONORIGIN_PLATFORM));
        apis[VK_API_VERSION_1_0].push_back(FunctionInfo("vkDestroyInstance",                                                            FUNCTIONORIGIN_INSTANCE));
index d19b046..95eb9da 100644 (file)
@@ -12,12 +12,12 @@ void DeviceDriver::destroyDevice (VkDevice device, const VkAllocationCallbacks*
        m_vk.destroyDevice(device, pAllocator);
 }
 
-void DeviceDriver::getDeviceQueue (VkDevice device, deUint32 queueFamilyIndex, deUint32 queueIndex, VkQueue* pQueue) const
+void DeviceDriver::getDeviceQueue (VkDevice device, uint32_t queueFamilyIndex, uint32_t queueIndex, VkQueue* pQueue) const
 {
        m_vk.getDeviceQueue(device, queueFamilyIndex, queueIndex, pQueue);
 }
 
-VkResult DeviceDriver::queueSubmit (VkQueue queue, deUint32 submitCount, const VkSubmitInfo* pSubmits, VkFence fence) const
+VkResult DeviceDriver::queueSubmit (VkQueue queue, uint32_t submitCount, const VkSubmitInfo* pSubmits, VkFence fence) const
 {
        return m_vk.queueSubmit(queue, submitCount, pSubmits, fence);
 }
@@ -52,12 +52,12 @@ void DeviceDriver::unmapMemory (VkDevice device, VkDeviceMemory memory) const
        m_vk.unmapMemory(device, memory);
 }
 
-VkResult DeviceDriver::flushMappedMemoryRanges (VkDevice device, deUint32 memoryRangeCount, const VkMappedMemoryRange* pMemoryRanges) const
+VkResult DeviceDriver::flushMappedMemoryRanges (VkDevice device, uint32_t memoryRangeCount, const VkMappedMemoryRange* pMemoryRanges) const
 {
        return m_vk.flushMappedMemoryRanges(device, memoryRangeCount, pMemoryRanges);
 }
 
-VkResult DeviceDriver::invalidateMappedMemoryRanges (VkDevice device, deUint32 memoryRangeCount, const VkMappedMemoryRange* pMemoryRanges) const
+VkResult DeviceDriver::invalidateMappedMemoryRanges (VkDevice device, uint32_t memoryRangeCount, const VkMappedMemoryRange* pMemoryRanges) const
 {
        return m_vk.invalidateMappedMemoryRanges(device, memoryRangeCount, pMemoryRanges);
 }
@@ -87,12 +87,12 @@ void DeviceDriver::getImageMemoryRequirements (VkDevice device, VkImage image, V
        m_vk.getImageMemoryRequirements(device, image, pMemoryRequirements);
 }
 
-void DeviceDriver::getImageSparseMemoryRequirements (VkDevice device, VkImage image, deUint32* pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements* pSparseMemoryRequirements) const
+void DeviceDriver::getImageSparseMemoryRequirements (VkDevice device, VkImage image, uint32_t* pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements* pSparseMemoryRequirements) const
 {
        m_vk.getImageSparseMemoryRequirements(device, image, pSparseMemoryRequirementCount, pSparseMemoryRequirements);
 }
 
-VkResult DeviceDriver::queueBindSparse (VkQueue queue, deUint32 bindInfoCount, const VkBindSparseInfo* pBindInfo, VkFence fence) const
+VkResult DeviceDriver::queueBindSparse (VkQueue queue, uint32_t bindInfoCount, const VkBindSparseInfo* pBindInfo, VkFence fence) const
 {
        return m_vk.queueBindSparse(queue, bindInfoCount, pBindInfo, fence);
 }
@@ -107,7 +107,7 @@ void DeviceDriver::destroyFence (VkDevice device, VkFence fence, const VkAllocat
        m_vk.destroyFence(device, fence, pAllocator);
 }
 
-VkResult DeviceDriver::resetFences (VkDevice device, deUint32 fenceCount, const VkFence* pFences) const
+VkResult DeviceDriver::resetFences (VkDevice device, uint32_t fenceCount, const VkFence* pFences) const
 {
        return m_vk.resetFences(device, fenceCount, pFences);
 }
@@ -117,7 +117,7 @@ VkResult DeviceDriver::getFenceStatus (VkDevice device, VkFence fence) const
        return m_vk.getFenceStatus(device, fence);
 }
 
-VkResult DeviceDriver::waitForFences (VkDevice device, deUint32 fenceCount, const VkFence* pFences, VkBool32 waitAll, deUint64 timeout) const
+VkResult DeviceDriver::waitForFences (VkDevice device, uint32_t fenceCount, const VkFence* pFences, VkBool32 waitAll, deUint64 timeout) const
 {
        return m_vk.waitForFences(device, fenceCount, pFences, waitAll, timeout);
 }
@@ -167,7 +167,7 @@ void DeviceDriver::destroyQueryPool (VkDevice device, VkQueryPool queryPool, con
        m_vk.destroyQueryPool(device, queryPool, pAllocator);
 }
 
-VkResult DeviceDriver::getQueryPoolResults (VkDevice device, VkQueryPool queryPool, deUint32 firstQuery, deUint32 queryCount, deUintptr dataSize, void* pData, VkDeviceSize stride, VkQueryResultFlags flags) const
+VkResult DeviceDriver::getQueryPoolResults (VkDevice device, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount, deUintptr dataSize, void* pData, VkDeviceSize stride, VkQueryResultFlags flags) const
 {
        return m_vk.getQueryPoolResults(device, queryPool, firstQuery, queryCount, dataSize, pData, stride, flags);
 }
@@ -242,17 +242,17 @@ VkResult DeviceDriver::getPipelineCacheData (VkDevice device, VkPipelineCache pi
        return m_vk.getPipelineCacheData(device, pipelineCache, pDataSize, pData);
 }
 
-VkResult DeviceDriver::mergePipelineCaches (VkDevice device, VkPipelineCache dstCache, deUint32 srcCacheCount, const VkPipelineCache* pSrcCaches) const
+VkResult DeviceDriver::mergePipelineCaches (VkDevice device, VkPipelineCache dstCache, uint32_t srcCacheCount, const VkPipelineCache* pSrcCaches) const
 {
        return m_vk.mergePipelineCaches(device, dstCache, srcCacheCount, pSrcCaches);
 }
 
-VkResult DeviceDriver::createGraphicsPipelines (VkDevice device, VkPipelineCache pipelineCache, deUint32 createInfoCount, const VkGraphicsPipelineCreateInfo* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkPipeline* pPipelines) const
+VkResult DeviceDriver::createGraphicsPipelines (VkDevice device, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkGraphicsPipelineCreateInfo* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkPipeline* pPipelines) const
 {
        return m_vk.createGraphicsPipelines(device, pipelineCache, createInfoCount, pCreateInfos, pAllocator, pPipelines);
 }
 
-VkResult DeviceDriver::createComputePipelines (VkDevice device, VkPipelineCache pipelineCache, deUint32 createInfoCount, const VkComputePipelineCreateInfo* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkPipeline* pPipelines) const
+VkResult DeviceDriver::createComputePipelines (VkDevice device, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkComputePipelineCreateInfo* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkPipeline* pPipelines) const
 {
        return m_vk.createComputePipelines(device, pipelineCache, createInfoCount, pCreateInfos, pAllocator, pPipelines);
 }
@@ -312,12 +312,12 @@ VkResult DeviceDriver::allocateDescriptorSets (VkDevice device, const VkDescript
        return m_vk.allocateDescriptorSets(device, pAllocateInfo, pDescriptorSets);
 }
 
-VkResult DeviceDriver::freeDescriptorSets (VkDevice device, VkDescriptorPool descriptorPool, deUint32 descriptorSetCount, const VkDescriptorSet* pDescriptorSets) const
+VkResult DeviceDriver::freeDescriptorSets (VkDevice device, VkDescriptorPool descriptorPool, uint32_t descriptorSetCount, const VkDescriptorSet* pDescriptorSets) const
 {
        return m_vk.freeDescriptorSets(device, descriptorPool, descriptorSetCount, pDescriptorSets);
 }
 
-void DeviceDriver::updateDescriptorSets (VkDevice device, deUint32 descriptorWriteCount, const VkWriteDescriptorSet* pDescriptorWrites, deUint32 descriptorCopyCount, const VkCopyDescriptorSet* pDescriptorCopies) const
+void DeviceDriver::updateDescriptorSets (VkDevice device, uint32_t descriptorWriteCount, const VkWriteDescriptorSet* pDescriptorWrites, uint32_t descriptorCopyCount, const VkCopyDescriptorSet* pDescriptorCopies) const
 {
        m_vk.updateDescriptorSets(device, descriptorWriteCount, pDescriptorWrites, descriptorCopyCount, pDescriptorCopies);
 }
@@ -367,7 +367,7 @@ VkResult DeviceDriver::allocateCommandBuffers (VkDevice device, const VkCommandB
        return m_vk.allocateCommandBuffers(device, pAllocateInfo, pCommandBuffers);
 }
 
-void DeviceDriver::freeCommandBuffers (VkDevice device, VkCommandPool commandPool, deUint32 commandBufferCount, const VkCommandBuffer* pCommandBuffers) const
+void DeviceDriver::freeCommandBuffers (VkDevice device, VkCommandPool commandPool, uint32_t commandBufferCount, const VkCommandBuffer* pCommandBuffers) const
 {
        m_vk.freeCommandBuffers(device, commandPool, commandBufferCount, pCommandBuffers);
 }
@@ -392,12 +392,12 @@ void DeviceDriver::cmdBindPipeline (VkCommandBuffer commandBuffer, VkPipelineBin
        m_vk.cmdBindPipeline(commandBuffer, pipelineBindPoint, pipeline);
 }
 
-void DeviceDriver::cmdSetViewport (VkCommandBuffer commandBuffer, deUint32 firstViewport, deUint32 viewportCount, const VkViewport* pViewports) const
+void DeviceDriver::cmdSetViewport (VkCommandBuffer commandBuffer, uint32_t firstViewport, uint32_t viewportCount, const VkViewport* pViewports) const
 {
        m_vk.cmdSetViewport(commandBuffer, firstViewport, viewportCount, pViewports);
 }
 
-void DeviceDriver::cmdSetScissor (VkCommandBuffer commandBuffer, deUint32 firstScissor, deUint32 scissorCount, const VkRect2D* pScissors) const
+void DeviceDriver::cmdSetScissor (VkCommandBuffer commandBuffer, uint32_t firstScissor, uint32_t scissorCount, const VkRect2D* pScissors) const
 {
        m_vk.cmdSetScissor(commandBuffer, firstScissor, scissorCount, pScissors);
 }
@@ -422,22 +422,22 @@ void DeviceDriver::cmdSetDepthBounds (VkCommandBuffer commandBuffer, float minDe
        m_vk.cmdSetDepthBounds(commandBuffer, minDepthBounds, maxDepthBounds);
 }
 
-void DeviceDriver::cmdSetStencilCompareMask (VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, deUint32 compareMask) const
+void DeviceDriver::cmdSetStencilCompareMask (VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t compareMask) const
 {
        m_vk.cmdSetStencilCompareMask(commandBuffer, faceMask, compareMask);
 }
 
-void DeviceDriver::cmdSetStencilWriteMask (VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, deUint32 writeMask) const
+void DeviceDriver::cmdSetStencilWriteMask (VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t writeMask) const
 {
        m_vk.cmdSetStencilWriteMask(commandBuffer, faceMask, writeMask);
 }
 
-void DeviceDriver::cmdSetStencilReference (VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, deUint32 reference) const
+void DeviceDriver::cmdSetStencilReference (VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t reference) const
 {
        m_vk.cmdSetStencilReference(commandBuffer, faceMask, reference);
 }
 
-void DeviceDriver::cmdBindDescriptorSets (VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, deUint32 firstSet, deUint32 descriptorSetCount, const VkDescriptorSet* pDescriptorSets, deUint32 dynamicOffsetCount, const deUint32* pDynamicOffsets) const
+void DeviceDriver::cmdBindDescriptorSets (VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, uint32_t firstSet, uint32_t descriptorSetCount, const VkDescriptorSet* pDescriptorSets, uint32_t dynamicOffsetCount, const uint32_t* pDynamicOffsets) const
 {
        m_vk.cmdBindDescriptorSets(commandBuffer, pipelineBindPoint, layout, firstSet, descriptorSetCount, pDescriptorSets, dynamicOffsetCount, pDynamicOffsets);
 }
@@ -447,32 +447,32 @@ void DeviceDriver::cmdBindIndexBuffer (VkCommandBuffer commandBuffer, VkBuffer b
        m_vk.cmdBindIndexBuffer(commandBuffer, buffer, offset, indexType);
 }
 
-void DeviceDriver::cmdBindVertexBuffers (VkCommandBuffer commandBuffer, deUint32 firstBinding, deUint32 bindingCount, const VkBuffer* pBuffers, const VkDeviceSize* pOffsets) const
+void DeviceDriver::cmdBindVertexBuffers (VkCommandBuffer commandBuffer, uint32_t firstBinding, uint32_t bindingCount, const VkBuffer* pBuffers, const VkDeviceSize* pOffsets) const
 {
        m_vk.cmdBindVertexBuffers(commandBuffer, firstBinding, bindingCount, pBuffers, pOffsets);
 }
 
-void DeviceDriver::cmdDraw (VkCommandBuffer commandBuffer, deUint32 vertexCount, deUint32 instanceCount, deUint32 firstVertex, deUint32 firstInstance) const
+void DeviceDriver::cmdDraw (VkCommandBuffer commandBuffer, uint32_t vertexCount, uint32_t instanceCount, uint32_t firstVertex, uint32_t firstInstance) const
 {
        m_vk.cmdDraw(commandBuffer, vertexCount, instanceCount, firstVertex, firstInstance);
 }
 
-void DeviceDriver::cmdDrawIndexed (VkCommandBuffer commandBuffer, deUint32 indexCount, deUint32 instanceCount, deUint32 firstIndex, deInt32 vertexOffset, deUint32 firstInstance) const
+void DeviceDriver::cmdDrawIndexed (VkCommandBuffer commandBuffer, uint32_t indexCount, uint32_t instanceCount, uint32_t firstIndex, int32_t vertexOffset, uint32_t firstInstance) const
 {
        m_vk.cmdDrawIndexed(commandBuffer, indexCount, instanceCount, firstIndex, vertexOffset, firstInstance);
 }
 
-void DeviceDriver::cmdDrawIndirect (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, deUint32 drawCount, deUint32 stride) const
+void DeviceDriver::cmdDrawIndirect (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride) const
 {
        m_vk.cmdDrawIndirect(commandBuffer, buffer, offset, drawCount, stride);
 }
 
-void DeviceDriver::cmdDrawIndexedIndirect (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, deUint32 drawCount, deUint32 stride) const
+void DeviceDriver::cmdDrawIndexedIndirect (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride) const
 {
        m_vk.cmdDrawIndexedIndirect(commandBuffer, buffer, offset, drawCount, stride);
 }
 
-void DeviceDriver::cmdDispatch (VkCommandBuffer commandBuffer, deUint32 groupCountX, deUint32 groupCountY, deUint32 groupCountZ) const
+void DeviceDriver::cmdDispatch (VkCommandBuffer commandBuffer, uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ) const
 {
        m_vk.cmdDispatch(commandBuffer, groupCountX, groupCountY, groupCountZ);
 }
@@ -482,27 +482,27 @@ void DeviceDriver::cmdDispatchIndirect (VkCommandBuffer commandBuffer, VkBuffer
        m_vk.cmdDispatchIndirect(commandBuffer, buffer, offset);
 }
 
-void DeviceDriver::cmdCopyBuffer (VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkBuffer dstBuffer, deUint32 regionCount, const VkBufferCopy* pRegions) const
+void DeviceDriver::cmdCopyBuffer (VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkBuffer dstBuffer, uint32_t regionCount, const VkBufferCopy* pRegions) const
 {
        m_vk.cmdCopyBuffer(commandBuffer, srcBuffer, dstBuffer, regionCount, pRegions);
 }
 
-void DeviceDriver::cmdCopyImage (VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, deUint32 regionCount, const VkImageCopy* pRegions) const
+void DeviceDriver::cmdCopyImage (VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageCopy* pRegions) const
 {
        m_vk.cmdCopyImage(commandBuffer, srcImage, srcImageLayout, dstImage, dstImageLayout, regionCount, pRegions);
 }
 
-void DeviceDriver::cmdBlitImage (VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, deUint32 regionCount, const VkImageBlit* pRegions, VkFilter filter) const
+void DeviceDriver::cmdBlitImage (VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageBlit* pRegions, VkFilter filter) const
 {
        m_vk.cmdBlitImage(commandBuffer, srcImage, srcImageLayout, dstImage, dstImageLayout, regionCount, pRegions, filter);
 }
 
-void DeviceDriver::cmdCopyBufferToImage (VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkImage dstImage, VkImageLayout dstImageLayout, deUint32 regionCount, const VkBufferImageCopy* pRegions) const
+void DeviceDriver::cmdCopyBufferToImage (VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkBufferImageCopy* pRegions) const
 {
        m_vk.cmdCopyBufferToImage(commandBuffer, srcBuffer, dstImage, dstImageLayout, regionCount, pRegions);
 }
 
-void DeviceDriver::cmdCopyImageToBuffer (VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkBuffer dstBuffer, deUint32 regionCount, const VkBufferImageCopy* pRegions) const
+void DeviceDriver::cmdCopyImageToBuffer (VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkBuffer dstBuffer, uint32_t regionCount, const VkBufferImageCopy* pRegions) const
 {
        m_vk.cmdCopyImageToBuffer(commandBuffer, srcImage, srcImageLayout, dstBuffer, regionCount, pRegions);
 }
@@ -512,27 +512,27 @@ void DeviceDriver::cmdUpdateBuffer (VkCommandBuffer commandBuffer, VkBuffer dstB
        m_vk.cmdUpdateBuffer(commandBuffer, dstBuffer, dstOffset, dataSize, pData);
 }
 
-void DeviceDriver::cmdFillBuffer (VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize size, deUint32 data) const
+void DeviceDriver::cmdFillBuffer (VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize size, uint32_t data) const
 {
        m_vk.cmdFillBuffer(commandBuffer, dstBuffer, dstOffset, size, data);
 }
 
-void DeviceDriver::cmdClearColorImage (VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearColorValue* pColor, deUint32 rangeCount, const VkImageSubresourceRange* pRanges) const
+void DeviceDriver::cmdClearColorImage (VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearColorValue* pColor, uint32_t rangeCount, const VkImageSubresourceRange* pRanges) const
 {
        m_vk.cmdClearColorImage(commandBuffer, image, imageLayout, pColor, rangeCount, pRanges);
 }
 
-void DeviceDriver::cmdClearDepthStencilImage (VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearDepthStencilValue* pDepthStencil, deUint32 rangeCount, const VkImageSubresourceRange* pRanges) const
+void DeviceDriver::cmdClearDepthStencilImage (VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearDepthStencilValue* pDepthStencil, uint32_t rangeCount, const VkImageSubresourceRange* pRanges) const
 {
        m_vk.cmdClearDepthStencilImage(commandBuffer, image, imageLayout, pDepthStencil, rangeCount, pRanges);
 }
 
-void DeviceDriver::cmdClearAttachments (VkCommandBuffer commandBuffer, deUint32 attachmentCount, const VkClearAttachment* pAttachments, deUint32 rectCount, const VkClearRect* pRects) const
+void DeviceDriver::cmdClearAttachments (VkCommandBuffer commandBuffer, uint32_t attachmentCount, const VkClearAttachment* pAttachments, uint32_t rectCount, const VkClearRect* pRects) const
 {
        m_vk.cmdClearAttachments(commandBuffer, attachmentCount, pAttachments, rectCount, pRects);
 }
 
-void DeviceDriver::cmdResolveImage (VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, deUint32 regionCount, const VkImageResolve* pRegions) const
+void DeviceDriver::cmdResolveImage (VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageResolve* pRegions) const
 {
        m_vk.cmdResolveImage(commandBuffer, srcImage, srcImageLayout, dstImage, dstImageLayout, regionCount, pRegions);
 }
@@ -547,42 +547,42 @@ void DeviceDriver::cmdResetEvent (VkCommandBuffer commandBuffer, VkEvent event,
        m_vk.cmdResetEvent(commandBuffer, event, stageMask);
 }
 
-void DeviceDriver::cmdWaitEvents (VkCommandBuffer commandBuffer, deUint32 eventCount, const VkEvent* pEvents, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, deUint32 memoryBarrierCount, const VkMemoryBarrier* pMemoryBarriers, deUint32 bufferMemoryBarrierCount, const VkBufferMemoryBarrier* pBufferMemoryBarriers, deUint32 imageMemoryBarrierCount, const VkImageMemoryBarrier* pImageMemoryBarriers) const
+void DeviceDriver::cmdWaitEvents (VkCommandBuffer commandBuffer, uint32_t eventCount, const VkEvent* pEvents, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, uint32_t memoryBarrierCount, const VkMemoryBarrier* pMemoryBarriers, uint32_t bufferMemoryBarrierCount, const VkBufferMemoryBarrier* pBufferMemoryBarriers, uint32_t imageMemoryBarrierCount, const VkImageMemoryBarrier* pImageMemoryBarriers) const
 {
        m_vk.cmdWaitEvents(commandBuffer, eventCount, pEvents, srcStageMask, dstStageMask, memoryBarrierCount, pMemoryBarriers, bufferMemoryBarrierCount, pBufferMemoryBarriers, imageMemoryBarrierCount, pImageMemoryBarriers);
 }
 
-void DeviceDriver::cmdPipelineBarrier (VkCommandBuffer commandBuffer, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, VkDependencyFlags dependencyFlags, deUint32 memoryBarrierCount, const VkMemoryBarrier* pMemoryBarriers, deUint32 bufferMemoryBarrierCount, const VkBufferMemoryBarrier* pBufferMemoryBarriers, deUint32 imageMemoryBarrierCount, const VkImageMemoryBarrier* pImageMemoryBarriers) const
+void DeviceDriver::cmdPipelineBarrier (VkCommandBuffer commandBuffer, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, VkDependencyFlags dependencyFlags, uint32_t memoryBarrierCount, const VkMemoryBarrier* pMemoryBarriers, uint32_t bufferMemoryBarrierCount, const VkBufferMemoryBarrier* pBufferMemoryBarriers, uint32_t imageMemoryBarrierCount, const VkImageMemoryBarrier* pImageMemoryBarriers) const
 {
        m_vk.cmdPipelineBarrier(commandBuffer, srcStageMask, dstStageMask, dependencyFlags, memoryBarrierCount, pMemoryBarriers, bufferMemoryBarrierCount, pBufferMemoryBarriers, imageMemoryBarrierCount, pImageMemoryBarriers);
 }
 
-void DeviceDriver::cmdBeginQuery (VkCommandBuffer commandBuffer, VkQueryPool queryPool, deUint32 query, VkQueryControlFlags flags) const
+void DeviceDriver::cmdBeginQuery (VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query, VkQueryControlFlags flags) const
 {
        m_vk.cmdBeginQuery(commandBuffer, queryPool, query, flags);
 }
 
-void DeviceDriver::cmdEndQuery (VkCommandBuffer commandBuffer, VkQueryPool queryPool, deUint32 query) const
+void DeviceDriver::cmdEndQuery (VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query) const
 {
        m_vk.cmdEndQuery(commandBuffer, queryPool, query);
 }
 
-void DeviceDriver::cmdResetQueryPool (VkCommandBuffer commandBuffer, VkQueryPool queryPool, deUint32 firstQuery, deUint32 queryCount) const
+void DeviceDriver::cmdResetQueryPool (VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount) const
 {
        m_vk.cmdResetQueryPool(commandBuffer, queryPool, firstQuery, queryCount);
 }
 
-void DeviceDriver::cmdWriteTimestamp (VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkQueryPool queryPool, deUint32 query) const
+void DeviceDriver::cmdWriteTimestamp (VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkQueryPool queryPool, uint32_t query) const
 {
        m_vk.cmdWriteTimestamp(commandBuffer, pipelineStage, queryPool, query);
 }
 
-void DeviceDriver::cmdCopyQueryPoolResults (VkCommandBuffer commandBuffer, VkQueryPool queryPool, deUint32 firstQuery, deUint32 queryCount, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize stride, VkQueryResultFlags flags) const
+void DeviceDriver::cmdCopyQueryPoolResults (VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize stride, VkQueryResultFlags flags) const
 {
        m_vk.cmdCopyQueryPoolResults(commandBuffer, queryPool, firstQuery, queryCount, dstBuffer, dstOffset, stride, flags);
 }
 
-void DeviceDriver::cmdPushConstants (VkCommandBuffer commandBuffer, VkPipelineLayout layout, VkShaderStageFlags stageFlags, deUint32 offset, deUint32 size, const void* pValues) const
+void DeviceDriver::cmdPushConstants (VkCommandBuffer commandBuffer, VkPipelineLayout layout, VkShaderStageFlags stageFlags, uint32_t offset, uint32_t size, const void* pValues) const
 {
        m_vk.cmdPushConstants(commandBuffer, layout, stageFlags, offset, size, pValues);
 }
@@ -602,32 +602,32 @@ void DeviceDriver::cmdEndRenderPass (VkCommandBuffer commandBuffer) const
        m_vk.cmdEndRenderPass(commandBuffer);
 }
 
-void DeviceDriver::cmdExecuteCommands (VkCommandBuffer commandBuffer, deUint32 commandBufferCount, const VkCommandBuffer* pCommandBuffers) const
+void DeviceDriver::cmdExecuteCommands (VkCommandBuffer commandBuffer, uint32_t commandBufferCount, const VkCommandBuffer* pCommandBuffers) const
 {
        m_vk.cmdExecuteCommands(commandBuffer, commandBufferCount, pCommandBuffers);
 }
 
-VkResult DeviceDriver::bindBufferMemory2 (VkDevice device, deUint32 bindInfoCount, const VkBindBufferMemoryInfo* pBindInfos) const
+VkResult DeviceDriver::bindBufferMemory2 (VkDevice device, uint32_t bindInfoCount, const VkBindBufferMemoryInfo* pBindInfos) const
 {
        return m_vk.bindBufferMemory2(device, bindInfoCount, pBindInfos);
 }
 
-VkResult DeviceDriver::bindImageMemory2 (VkDevice device, deUint32 bindInfoCount, const VkBindImageMemoryInfo* pBindInfos) const
+VkResult DeviceDriver::bindImageMemory2 (VkDevice device, uint32_t bindInfoCount, const VkBindImageMemoryInfo* pBindInfos) const
 {
        return m_vk.bindImageMemory2(device, bindInfoCount, pBindInfos);
 }
 
-void DeviceDriver::getDeviceGroupPeerMemoryFeatures (VkDevice device, deUint32 heapIndex, deUint32 localDeviceIndex, deUint32 remoteDeviceIndex, VkPeerMemoryFeatureFlags* pPeerMemoryFeatures) const
+void DeviceDriver::getDeviceGroupPeerMemoryFeatures (VkDevice device, uint32_t heapIndex, uint32_t localDeviceIndex, uint32_t remoteDeviceIndex, VkPeerMemoryFeatureFlags* pPeerMemoryFeatures) const
 {
        m_vk.getDeviceGroupPeerMemoryFeatures(device, heapIndex, localDeviceIndex, remoteDeviceIndex, pPeerMemoryFeatures);
 }
 
-void DeviceDriver::cmdSetDeviceMask (VkCommandBuffer commandBuffer, deUint32 deviceMask) const
+void DeviceDriver::cmdSetDeviceMask (VkCommandBuffer commandBuffer, uint32_t deviceMask) const
 {
        m_vk.cmdSetDeviceMask(commandBuffer, deviceMask);
 }
 
-void DeviceDriver::cmdDispatchBase (VkCommandBuffer commandBuffer, deUint32 baseGroupX, deUint32 baseGroupY, deUint32 baseGroupZ, deUint32 groupCountX, deUint32 groupCountY, deUint32 groupCountZ) const
+void DeviceDriver::cmdDispatchBase (VkCommandBuffer commandBuffer, uint32_t baseGroupX, uint32_t baseGroupY, uint32_t baseGroupZ, uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ) const
 {
        m_vk.cmdDispatchBase(commandBuffer, baseGroupX, baseGroupY, baseGroupZ, groupCountX, groupCountY, groupCountZ);
 }
@@ -642,7 +642,7 @@ void DeviceDriver::getBufferMemoryRequirements2 (VkDevice device, const VkBuffer
        m_vk.getBufferMemoryRequirements2(device, pInfo, pMemoryRequirements);
 }
 
-void DeviceDriver::getImageSparseMemoryRequirements2 (VkDevice device, const VkImageSparseMemoryRequirementsInfo2* pInfo, deUint32* pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements2* pSparseMemoryRequirements) const
+void DeviceDriver::getImageSparseMemoryRequirements2 (VkDevice device, const VkImageSparseMemoryRequirementsInfo2* pInfo, uint32_t* pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements2* pSparseMemoryRequirements) const
 {
        m_vk.getImageSparseMemoryRequirements2(device, pInfo, pSparseMemoryRequirementCount, pSparseMemoryRequirements);
 }
@@ -687,12 +687,12 @@ void DeviceDriver::getDescriptorSetLayoutSupport (VkDevice device, const VkDescr
        m_vk.getDescriptorSetLayoutSupport(device, pCreateInfo, pSupport);
 }
 
-void DeviceDriver::cmdDrawIndirectCount (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, deUint32 maxDrawCount, deUint32 stride) const
+void DeviceDriver::cmdDrawIndirectCount (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride) const
 {
        m_vk.cmdDrawIndirectCount(commandBuffer, buffer, offset, countBuffer, countBufferOffset, maxDrawCount, stride);
 }
 
-void DeviceDriver::cmdDrawIndexedIndirectCount (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, deUint32 maxDrawCount, deUint32 stride) const
+void DeviceDriver::cmdDrawIndexedIndirectCount (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride) const
 {
        m_vk.cmdDrawIndexedIndirectCount(commandBuffer, buffer, offset, countBuffer, countBufferOffset, maxDrawCount, stride);
 }
@@ -717,7 +717,7 @@ void DeviceDriver::cmdEndRenderPass2 (VkCommandBuffer commandBuffer, const VkSub
        m_vk.cmdEndRenderPass2(commandBuffer, pSubpassEndInfo);
 }
 
-void DeviceDriver::resetQueryPool (VkDevice device, VkQueryPool queryPool, deUint32 firstQuery, deUint32 queryCount) const
+void DeviceDriver::resetQueryPool (VkDevice device, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount) const
 {
        m_vk.resetQueryPool(device, queryPool, firstQuery, queryCount);
 }
@@ -762,12 +762,12 @@ void DeviceDriver::destroySwapchainKHR (VkDevice device, VkSwapchainKHR swapchai
        m_vk.destroySwapchainKHR(device, swapchain, pAllocator);
 }
 
-VkResult DeviceDriver::getSwapchainImagesKHR (VkDevice device, VkSwapchainKHR swapchain, deUint32* pSwapchainImageCount, VkImage* pSwapchainImages) const
+VkResult DeviceDriver::getSwapchainImagesKHR (VkDevice device, VkSwapchainKHR swapchain, uint32_t* pSwapchainImageCount, VkImage* pSwapchainImages) const
 {
        return m_vk.getSwapchainImagesKHR(device, swapchain, pSwapchainImageCount, pSwapchainImages);
 }
 
-VkResult DeviceDriver::acquireNextImageKHR (VkDevice device, VkSwapchainKHR swapchain, deUint64 timeout, VkSemaphore semaphore, VkFence fence, deUint32* pImageIndex) const
+VkResult DeviceDriver::acquireNextImageKHR (VkDevice device, VkSwapchainKHR swapchain, deUint64 timeout, VkSemaphore semaphore, VkFence fence, uint32_t* pImageIndex) const
 {
        return m_vk.acquireNextImageKHR(device, swapchain, timeout, semaphore, fence, pImageIndex);
 }
@@ -787,12 +787,12 @@ VkResult DeviceDriver::getDeviceGroupSurfacePresentModesKHR (VkDevice device, Vk
        return m_vk.getDeviceGroupSurfacePresentModesKHR(device, surface, pModes);
 }
 
-VkResult DeviceDriver::acquireNextImage2KHR (VkDevice device, const VkAcquireNextImageInfoKHR* pAcquireInfo, deUint32* pImageIndex) const
+VkResult DeviceDriver::acquireNextImage2KHR (VkDevice device, const VkAcquireNextImageInfoKHR* pAcquireInfo, uint32_t* pImageIndex) const
 {
        return m_vk.acquireNextImage2KHR(device, pAcquireInfo, pImageIndex);
 }
 
-VkResult DeviceDriver::createSharedSwapchainsKHR (VkDevice device, deUint32 swapchainCount, const VkSwapchainCreateInfoKHR* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkSwapchainKHR* pSwapchains) const
+VkResult DeviceDriver::createSharedSwapchainsKHR (VkDevice device, uint32_t swapchainCount, const VkSwapchainCreateInfoKHR* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkSwapchainKHR* pSwapchains) const
 {
        return m_vk.createSharedSwapchainsKHR(device, swapchainCount, pCreateInfos, pAllocator, pSwapchains);
 }
@@ -817,12 +817,12 @@ VkResult DeviceDriver::getSemaphoreFdKHR (VkDevice device, const VkSemaphoreGetF
        return m_vk.getSemaphoreFdKHR(device, pGetFdInfo, pFd);
 }
 
-void DeviceDriver::cmdPushDescriptorSetKHR (VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, deUint32 set, deUint32 descriptorWriteCount, const VkWriteDescriptorSet* pDescriptorWrites) const
+void DeviceDriver::cmdPushDescriptorSetKHR (VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, uint32_t set, uint32_t descriptorWriteCount, const VkWriteDescriptorSet* pDescriptorWrites) const
 {
        m_vk.cmdPushDescriptorSetKHR(commandBuffer, pipelineBindPoint, layout, set, descriptorWriteCount, pDescriptorWrites);
 }
 
-void DeviceDriver::cmdPushDescriptorSetWithTemplateKHR (VkCommandBuffer commandBuffer, VkDescriptorUpdateTemplate descriptorUpdateTemplate, VkPipelineLayout layout, deUint32 set, const void* pData) const
+void DeviceDriver::cmdPushDescriptorSetWithTemplateKHR (VkCommandBuffer commandBuffer, VkDescriptorUpdateTemplate descriptorUpdateTemplate, VkPipelineLayout layout, uint32_t set, const void* pData) const
 {
        m_vk.cmdPushDescriptorSetWithTemplateKHR(commandBuffer, descriptorUpdateTemplate, layout, set, pData);
 }
@@ -882,17 +882,17 @@ VkResult DeviceDriver::deferredOperationJoinKHR (VkDevice device, VkDeferredOper
        return m_vk.deferredOperationJoinKHR(device, operation);
 }
 
-VkResult DeviceDriver::getPipelineExecutablePropertiesKHR (VkDevice device, const VkPipelineInfoKHR* pPipelineInfo, deUint32* pExecutableCount, VkPipelineExecutablePropertiesKHR* pProperties) const
+VkResult DeviceDriver::getPipelineExecutablePropertiesKHR (VkDevice device, const VkPipelineInfoKHR* pPipelineInfo, uint32_t* pExecutableCount, VkPipelineExecutablePropertiesKHR* pProperties) const
 {
        return m_vk.getPipelineExecutablePropertiesKHR(device, pPipelineInfo, pExecutableCount, pProperties);
 }
 
-VkResult DeviceDriver::getPipelineExecutableStatisticsKHR (VkDevice device, const VkPipelineExecutableInfoKHR* pExecutableInfo, deUint32* pStatisticCount, VkPipelineExecutableStatisticKHR* pStatistics) const
+VkResult DeviceDriver::getPipelineExecutableStatisticsKHR (VkDevice device, const VkPipelineExecutableInfoKHR* pExecutableInfo, uint32_t* pStatisticCount, VkPipelineExecutableStatisticKHR* pStatistics) const
 {
        return m_vk.getPipelineExecutableStatisticsKHR(device, pExecutableInfo, pStatisticCount, pStatistics);
 }
 
-VkResult DeviceDriver::getPipelineExecutableInternalRepresentationsKHR (VkDevice device, const VkPipelineExecutableInfoKHR* pExecutableInfo, deUint32* pInternalRepresentationCount, VkPipelineExecutableInternalRepresentationKHR* pInternalRepresentations) const
+VkResult DeviceDriver::getPipelineExecutableInternalRepresentationsKHR (VkDevice device, const VkPipelineExecutableInfoKHR* pExecutableInfo, uint32_t* pInternalRepresentationCount, VkPipelineExecutableInternalRepresentationKHR* pInternalRepresentations) const
 {
        return m_vk.getPipelineExecutableInternalRepresentationsKHR(device, pExecutableInfo, pInternalRepresentationCount, pInternalRepresentations);
 }
@@ -907,7 +907,7 @@ void DeviceDriver::cmdResetEvent2KHR (VkCommandBuffer commandBuffer, VkEvent eve
        m_vk.cmdResetEvent2KHR(commandBuffer, event, stageMask);
 }
 
-void DeviceDriver::cmdWaitEvents2KHR (VkCommandBuffer commandBuffer, deUint32 eventCount, const VkEvent* pEvents, const VkDependencyInfoKHR* pDependencyInfos) const
+void DeviceDriver::cmdWaitEvents2KHR (VkCommandBuffer commandBuffer, uint32_t eventCount, const VkEvent* pEvents, const VkDependencyInfoKHR* pDependencyInfos) const
 {
        m_vk.cmdWaitEvents2KHR(commandBuffer, eventCount, pEvents, pDependencyInfos);
 }
@@ -917,22 +917,22 @@ void DeviceDriver::cmdPipelineBarrier2KHR (VkCommandBuffer commandBuffer, const
        m_vk.cmdPipelineBarrier2KHR(commandBuffer, pDependencyInfo);
 }
 
-void DeviceDriver::cmdWriteTimestamp2KHR (VkCommandBuffer commandBuffer, VkPipelineStageFlags2KHR stage, VkQueryPool queryPool, deUint32 query) const
+void DeviceDriver::cmdWriteTimestamp2KHR (VkCommandBuffer commandBuffer, VkPipelineStageFlags2KHR stage, VkQueryPool queryPool, uint32_t query) const
 {
        m_vk.cmdWriteTimestamp2KHR(commandBuffer, stage, queryPool, query);
 }
 
-VkResult DeviceDriver::queueSubmit2KHR (VkQueue queue, deUint32 submitCount, const VkSubmitInfo2KHR* pSubmits, VkFence fence) const
+VkResult DeviceDriver::queueSubmit2KHR (VkQueue queue, uint32_t submitCount, const VkSubmitInfo2KHR* pSubmits, VkFence fence) const
 {
        return m_vk.queueSubmit2KHR(queue, submitCount, pSubmits, fence);
 }
 
-void DeviceDriver::cmdWriteBufferMarker2AMD (VkCommandBuffer commandBuffer, VkPipelineStageFlags2KHR stage, VkBuffer dstBuffer, VkDeviceSize dstOffset, deUint32 marker) const
+void DeviceDriver::cmdWriteBufferMarker2AMD (VkCommandBuffer commandBuffer, VkPipelineStageFlags2KHR stage, VkBuffer dstBuffer, VkDeviceSize dstOffset, uint32_t marker) const
 {
        m_vk.cmdWriteBufferMarker2AMD(commandBuffer, stage, dstBuffer, dstOffset, marker);
 }
 
-void DeviceDriver::getQueueCheckpointData2NV (VkQueue queue, deUint32* pCheckpointDataCount, VkCheckpointData2NV* pCheckpointData) const
+void DeviceDriver::getQueueCheckpointData2NV (VkQueue queue, uint32_t* pCheckpointDataCount, VkCheckpointData2NV* pCheckpointData) const
 {
        m_vk.getQueueCheckpointData2NV(queue, pCheckpointDataCount, pCheckpointData);
 }
@@ -992,32 +992,32 @@ void DeviceDriver::cmdDebugMarkerInsertEXT (VkCommandBuffer commandBuffer, const
        m_vk.cmdDebugMarkerInsertEXT(commandBuffer, pMarkerInfo);
 }
 
-void DeviceDriver::cmdBindTransformFeedbackBuffersEXT (VkCommandBuffer commandBuffer, deUint32 firstBinding, deUint32 bindingCount, const VkBuffer* pBuffers, const VkDeviceSize* pOffsets, const VkDeviceSize* pSizes) const
+void DeviceDriver::cmdBindTransformFeedbackBuffersEXT (VkCommandBuffer commandBuffer, uint32_t firstBinding, uint32_t bindingCount, const VkBuffer* pBuffers, const VkDeviceSize* pOffsets, const VkDeviceSize* pSizes) const
 {
        m_vk.cmdBindTransformFeedbackBuffersEXT(commandBuffer, firstBinding, bindingCount, pBuffers, pOffsets, pSizes);
 }
 
-void DeviceDriver::cmdBeginTransformFeedbackEXT (VkCommandBuffer commandBuffer, deUint32 firstCounterBuffer, deUint32 counterBufferCount, const VkBuffer* pCounterBuffers, const VkDeviceSize* pCounterBufferOffsets) const
+void DeviceDriver::cmdBeginTransformFeedbackEXT (VkCommandBuffer commandBuffer, uint32_t firstCounterBuffer, uint32_t counterBufferCount, const VkBuffer* pCounterBuffers, const VkDeviceSize* pCounterBufferOffsets) const
 {
        m_vk.cmdBeginTransformFeedbackEXT(commandBuffer, firstCounterBuffer, counterBufferCount, pCounterBuffers, pCounterBufferOffsets);
 }
 
-void DeviceDriver::cmdEndTransformFeedbackEXT (VkCommandBuffer commandBuffer, deUint32 firstCounterBuffer, deUint32 counterBufferCount, const VkBuffer* pCounterBuffers, const VkDeviceSize* pCounterBufferOffsets) const
+void DeviceDriver::cmdEndTransformFeedbackEXT (VkCommandBuffer commandBuffer, uint32_t firstCounterBuffer, uint32_t counterBufferCount, const VkBuffer* pCounterBuffers, const VkDeviceSize* pCounterBufferOffsets) const
 {
        m_vk.cmdEndTransformFeedbackEXT(commandBuffer, firstCounterBuffer, counterBufferCount, pCounterBuffers, pCounterBufferOffsets);
 }
 
-void DeviceDriver::cmdBeginQueryIndexedEXT (VkCommandBuffer commandBuffer, VkQueryPool queryPool, deUint32 query, VkQueryControlFlags flags, deUint32 index) const
+void DeviceDriver::cmdBeginQueryIndexedEXT (VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query, VkQueryControlFlags flags, uint32_t index) const
 {
        m_vk.cmdBeginQueryIndexedEXT(commandBuffer, queryPool, query, flags, index);
 }
 
-void DeviceDriver::cmdEndQueryIndexedEXT (VkCommandBuffer commandBuffer, VkQueryPool queryPool, deUint32 query, deUint32 index) const
+void DeviceDriver::cmdEndQueryIndexedEXT (VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query, uint32_t index) const
 {
        m_vk.cmdEndQueryIndexedEXT(commandBuffer, queryPool, query, index);
 }
 
-void DeviceDriver::cmdDrawIndirectByteCountEXT (VkCommandBuffer commandBuffer, deUint32 instanceCount, deUint32 firstInstance, VkBuffer counterBuffer, VkDeviceSize counterBufferOffset, deUint32 counterOffset, deUint32 vertexStride) const
+void DeviceDriver::cmdDrawIndirectByteCountEXT (VkCommandBuffer commandBuffer, uint32_t instanceCount, uint32_t firstInstance, VkBuffer counterBuffer, VkDeviceSize counterBufferOffset, uint32_t counterOffset, uint32_t vertexStride) const
 {
        m_vk.cmdDrawIndirectByteCountEXT(commandBuffer, instanceCount, firstInstance, counterBuffer, counterBufferOffset, counterOffset, vertexStride);
 }
@@ -1057,12 +1057,12 @@ VkResult DeviceDriver::getImageViewAddressNVX (VkDevice device, VkImageView imag
        return m_vk.getImageViewAddressNVX(device, imageView, pProperties);
 }
 
-void DeviceDriver::cmdDrawIndirectCountAMD (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, deUint32 maxDrawCount, deUint32 stride) const
+void DeviceDriver::cmdDrawIndirectCountAMD (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride) const
 {
        m_vk.cmdDrawIndirectCountAMD(commandBuffer, buffer, offset, countBuffer, countBufferOffset, maxDrawCount, stride);
 }
 
-void DeviceDriver::cmdDrawIndexedIndirectCountAMD (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, deUint32 maxDrawCount, deUint32 stride) const
+void DeviceDriver::cmdDrawIndexedIndirectCountAMD (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride) const
 {
        m_vk.cmdDrawIndexedIndirectCountAMD(commandBuffer, buffer, offset, countBuffer, countBufferOffset, maxDrawCount, stride);
 }
@@ -1082,7 +1082,7 @@ void DeviceDriver::cmdEndConditionalRenderingEXT (VkCommandBuffer commandBuffer)
        m_vk.cmdEndConditionalRenderingEXT(commandBuffer);
 }
 
-void DeviceDriver::cmdSetViewportWScalingNV (VkCommandBuffer commandBuffer, deUint32 firstViewport, deUint32 viewportCount, const VkViewportWScalingNV* pViewportWScalings) const
+void DeviceDriver::cmdSetViewportWScalingNV (VkCommandBuffer commandBuffer, uint32_t firstViewport, uint32_t viewportCount, const VkViewportWScalingNV* pViewportWScalings) const
 {
        m_vk.cmdSetViewportWScalingNV(commandBuffer, firstViewport, viewportCount, pViewportWScalings);
 }
@@ -1112,17 +1112,17 @@ VkResult DeviceDriver::getRefreshCycleDurationGOOGLE (VkDevice device, VkSwapcha
        return m_vk.getRefreshCycleDurationGOOGLE(device, swapchain, pDisplayTimingProperties);
 }
 
-VkResult DeviceDriver::getPastPresentationTimingGOOGLE (VkDevice device, VkSwapchainKHR swapchain, deUint32* pPresentationTimingCount, VkPastPresentationTimingGOOGLE* pPresentationTimings) const
+VkResult DeviceDriver::getPastPresentationTimingGOOGLE (VkDevice device, VkSwapchainKHR swapchain, uint32_t* pPresentationTimingCount, VkPastPresentationTimingGOOGLE* pPresentationTimings) const
 {
        return m_vk.getPastPresentationTimingGOOGLE(device, swapchain, pPresentationTimingCount, pPresentationTimings);
 }
 
-void DeviceDriver::cmdSetDiscardRectangleEXT (VkCommandBuffer commandBuffer, deUint32 firstDiscardRectangle, deUint32 discardRectangleCount, const VkRect2D* pDiscardRectangles) const
+void DeviceDriver::cmdSetDiscardRectangleEXT (VkCommandBuffer commandBuffer, uint32_t firstDiscardRectangle, uint32_t discardRectangleCount, const VkRect2D* pDiscardRectangles) const
 {
        m_vk.cmdSetDiscardRectangleEXT(commandBuffer, firstDiscardRectangle, discardRectangleCount, pDiscardRectangles);
 }
 
-void DeviceDriver::setHdrMetadataEXT (VkDevice device, deUint32 swapchainCount, const VkSwapchainKHR* pSwapchains, const VkHdrMetadataEXT* pMetadata) const
+void DeviceDriver::setHdrMetadataEXT (VkDevice device, uint32_t swapchainCount, const VkSwapchainKHR* pSwapchains, const VkHdrMetadataEXT* pMetadata) const
 {
        m_vk.setHdrMetadataEXT(device, swapchainCount, pSwapchains, pMetadata);
 }
@@ -1187,7 +1187,7 @@ void DeviceDriver::destroyValidationCacheEXT (VkDevice device, VkValidationCache
        m_vk.destroyValidationCacheEXT(device, validationCache, pAllocator);
 }
 
-VkResult DeviceDriver::mergeValidationCachesEXT (VkDevice device, VkValidationCacheEXT dstCache, deUint32 srcCacheCount, const VkValidationCacheEXT* pSrcCaches) const
+VkResult DeviceDriver::mergeValidationCachesEXT (VkDevice device, VkValidationCacheEXT dstCache, uint32_t srcCacheCount, const VkValidationCacheEXT* pSrcCaches) const
 {
        return m_vk.mergeValidationCachesEXT(device, dstCache, srcCacheCount, pSrcCaches);
 }
@@ -1202,12 +1202,12 @@ void DeviceDriver::cmdBindShadingRateImageNV (VkCommandBuffer commandBuffer, VkI
        m_vk.cmdBindShadingRateImageNV(commandBuffer, imageView, imageLayout);
 }
 
-void DeviceDriver::cmdSetViewportShadingRatePaletteNV (VkCommandBuffer commandBuffer, deUint32 firstViewport, deUint32 viewportCount, const VkShadingRatePaletteNV* pShadingRatePalettes) const
+void DeviceDriver::cmdSetViewportShadingRatePaletteNV (VkCommandBuffer commandBuffer, uint32_t firstViewport, uint32_t viewportCount, const VkShadingRatePaletteNV* pShadingRatePalettes) const
 {
        m_vk.cmdSetViewportShadingRatePaletteNV(commandBuffer, firstViewport, viewportCount, pShadingRatePalettes);
 }
 
-void DeviceDriver::cmdSetCoarseSampleOrderNV (VkCommandBuffer commandBuffer, VkCoarseSampleOrderTypeNV sampleOrderType, deUint32 customSampleOrderCount, const VkCoarseSampleOrderCustomNV* pCustomSampleOrders) const
+void DeviceDriver::cmdSetCoarseSampleOrderNV (VkCommandBuffer commandBuffer, VkCoarseSampleOrderTypeNV sampleOrderType, uint32_t customSampleOrderCount, const VkCoarseSampleOrderCustomNV* pCustomSampleOrders) const
 {
        m_vk.cmdSetCoarseSampleOrderNV(commandBuffer, sampleOrderType, customSampleOrderCount, pCustomSampleOrders);
 }
@@ -1227,7 +1227,7 @@ void DeviceDriver::getAccelerationStructureMemoryRequirementsNV (VkDevice device
        m_vk.getAccelerationStructureMemoryRequirementsNV(device, pInfo, pMemoryRequirements);
 }
 
-VkResult DeviceDriver::bindAccelerationStructureMemoryNV (VkDevice device, deUint32 bindInfoCount, const VkBindAccelerationStructureMemoryInfoNV* pBindInfos) const
+VkResult DeviceDriver::bindAccelerationStructureMemoryNV (VkDevice device, uint32_t bindInfoCount, const VkBindAccelerationStructureMemoryInfoNV* pBindInfos) const
 {
        return m_vk.bindAccelerationStructureMemoryNV(device, bindInfoCount, pBindInfos);
 }
@@ -1242,22 +1242,22 @@ void DeviceDriver::cmdCopyAccelerationStructureNV (VkCommandBuffer commandBuffer
        m_vk.cmdCopyAccelerationStructureNV(commandBuffer, dst, src, mode);
 }
 
-void DeviceDriver::cmdTraceRaysNV (VkCommandBuffer commandBuffer, VkBuffer raygenShaderBindingTableBuffer, VkDeviceSize raygenShaderBindingOffset, VkBuffer missShaderBindingTableBuffer, VkDeviceSize missShaderBindingOffset, VkDeviceSize missShaderBindingStride, VkBuffer hitShaderBindingTableBuffer, VkDeviceSize hitShaderBindingOffset, VkDeviceSize hitShaderBindingStride, VkBuffer callableShaderBindingTableBuffer, VkDeviceSize callableShaderBindingOffset, VkDeviceSize callableShaderBindingStride, deUint32 width, deUint32 height, deUint32 depth) const
+void DeviceDriver::cmdTraceRaysNV (VkCommandBuffer commandBuffer, VkBuffer raygenShaderBindingTableBuffer, VkDeviceSize raygenShaderBindingOffset, VkBuffer missShaderBindingTableBuffer, VkDeviceSize missShaderBindingOffset, VkDeviceSize missShaderBindingStride, VkBuffer hitShaderBindingTableBuffer, VkDeviceSize hitShaderBindingOffset, VkDeviceSize hitShaderBindingStride, VkBuffer callableShaderBindingTableBuffer, VkDeviceSize callableShaderBindingOffset, VkDeviceSize callableShaderBindingStride, uint32_t width, uint32_t height, uint32_t depth) const
 {
        m_vk.cmdTraceRaysNV(commandBuffer, raygenShaderBindingTableBuffer, raygenShaderBindingOffset, missShaderBindingTableBuffer, missShaderBindingOffset, missShaderBindingStride, hitShaderBindingTableBuffer, hitShaderBindingOffset, hitShaderBindingStride, callableShaderBindingTableBuffer, callableShaderBindingOffset, callableShaderBindingStride, width, height, depth);
 }
 
-VkResult DeviceDriver::createRayTracingPipelinesNV (VkDevice device, VkPipelineCache pipelineCache, deUint32 createInfoCount, const VkRayTracingPipelineCreateInfoNV* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkPipeline* pPipelines) const
+VkResult DeviceDriver::createRayTracingPipelinesNV (VkDevice device, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkRayTracingPipelineCreateInfoNV* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkPipeline* pPipelines) const
 {
        return m_vk.createRayTracingPipelinesNV(device, pipelineCache, createInfoCount, pCreateInfos, pAllocator, pPipelines);
 }
 
-VkResult DeviceDriver::getRayTracingShaderGroupHandlesKHR (VkDevice device, VkPipeline pipeline, deUint32 firstGroup, deUint32 groupCount, deUintptr dataSize, void* pData) const
+VkResult DeviceDriver::getRayTracingShaderGroupHandlesKHR (VkDevice device, VkPipeline pipeline, uint32_t firstGroup, uint32_t groupCount, deUintptr dataSize, void* pData) const
 {
        return m_vk.getRayTracingShaderGroupHandlesKHR(device, pipeline, firstGroup, groupCount, dataSize, pData);
 }
 
-VkResult DeviceDriver::getRayTracingShaderGroupHandlesNV (VkDevice device, VkPipeline pipeline, deUint32 firstGroup, deUint32 groupCount, deUintptr dataSize, void* pData) const
+VkResult DeviceDriver::getRayTracingShaderGroupHandlesNV (VkDevice device, VkPipeline pipeline, uint32_t firstGroup, uint32_t groupCount, deUintptr dataSize, void* pData) const
 {
        return m_vk.getRayTracingShaderGroupHandlesNV(device, pipeline, firstGroup, groupCount, dataSize, pData);
 }
@@ -1267,12 +1267,12 @@ VkResult DeviceDriver::getAccelerationStructureHandleNV (VkDevice device, VkAcce
        return m_vk.getAccelerationStructureHandleNV(device, accelerationStructure, dataSize, pData);
 }
 
-void DeviceDriver::cmdWriteAccelerationStructuresPropertiesNV (VkCommandBuffer commandBuffer, deUint32 accelerationStructureCount, const VkAccelerationStructureNV* pAccelerationStructures, VkQueryType queryType, VkQueryPool queryPool, deUint32 firstQuery) const
+void DeviceDriver::cmdWriteAccelerationStructuresPropertiesNV (VkCommandBuffer commandBuffer, uint32_t accelerationStructureCount, const VkAccelerationStructureNV* pAccelerationStructures, VkQueryType queryType, VkQueryPool queryPool, uint32_t firstQuery) const
 {
        m_vk.cmdWriteAccelerationStructuresPropertiesNV(commandBuffer, accelerationStructureCount, pAccelerationStructures, queryType, queryPool, firstQuery);
 }
 
-VkResult DeviceDriver::compileDeferredNV (VkDevice device, VkPipeline pipeline, deUint32 shader) const
+VkResult DeviceDriver::compileDeferredNV (VkDevice device, VkPipeline pipeline, uint32_t shader) const
 {
        return m_vk.compileDeferredNV(device, pipeline, shader);
 }
@@ -1282,32 +1282,32 @@ VkResult DeviceDriver::getMemoryHostPointerPropertiesEXT (VkDevice device, VkExt
        return m_vk.getMemoryHostPointerPropertiesEXT(device, handleType, pHostPointer, pMemoryHostPointerProperties);
 }
 
-void DeviceDriver::cmdWriteBufferMarkerAMD (VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkBuffer dstBuffer, VkDeviceSize dstOffset, deUint32 marker) const
+void DeviceDriver::cmdWriteBufferMarkerAMD (VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkBuffer dstBuffer, VkDeviceSize dstOffset, uint32_t marker) const
 {
        m_vk.cmdWriteBufferMarkerAMD(commandBuffer, pipelineStage, dstBuffer, dstOffset, marker);
 }
 
-VkResult DeviceDriver::getCalibratedTimestampsEXT (VkDevice device, deUint32 timestampCount, const VkCalibratedTimestampInfoEXT* pTimestampInfos, deUint64* pTimestamps, deUint64* pMaxDeviation) const
+VkResult DeviceDriver::getCalibratedTimestampsEXT (VkDevice device, uint32_t timestampCount, const VkCalibratedTimestampInfoEXT* pTimestampInfos, deUint64* pTimestamps, deUint64* pMaxDeviation) const
 {
        return m_vk.getCalibratedTimestampsEXT(device, timestampCount, pTimestampInfos, pTimestamps, pMaxDeviation);
 }
 
-void DeviceDriver::cmdDrawMeshTasksNV (VkCommandBuffer commandBuffer, deUint32 taskCount, deUint32 firstTask) const
+void DeviceDriver::cmdDrawMeshTasksNV (VkCommandBuffer commandBuffer, uint32_t taskCount, uint32_t firstTask) const
 {
        m_vk.cmdDrawMeshTasksNV(commandBuffer, taskCount, firstTask);
 }
 
-void DeviceDriver::cmdDrawMeshTasksIndirectNV (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, deUint32 drawCount, deUint32 stride) const
+void DeviceDriver::cmdDrawMeshTasksIndirectNV (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride) const
 {
        m_vk.cmdDrawMeshTasksIndirectNV(commandBuffer, buffer, offset, drawCount, stride);
 }
 
-void DeviceDriver::cmdDrawMeshTasksIndirectCountNV (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, deUint32 maxDrawCount, deUint32 stride) const
+void DeviceDriver::cmdDrawMeshTasksIndirectCountNV (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride) const
 {
        m_vk.cmdDrawMeshTasksIndirectCountNV(commandBuffer, buffer, offset, countBuffer, countBufferOffset, maxDrawCount, stride);
 }
 
-void DeviceDriver::cmdSetExclusiveScissorNV (VkCommandBuffer commandBuffer, deUint32 firstExclusiveScissor, deUint32 exclusiveScissorCount, const VkRect2D* pExclusiveScissors) const
+void DeviceDriver::cmdSetExclusiveScissorNV (VkCommandBuffer commandBuffer, uint32_t firstExclusiveScissor, uint32_t exclusiveScissorCount, const VkRect2D* pExclusiveScissors) const
 {
        m_vk.cmdSetExclusiveScissorNV(commandBuffer, firstExclusiveScissor, exclusiveScissorCount, pExclusiveScissors);
 }
@@ -1317,7 +1317,7 @@ void DeviceDriver::cmdSetCheckpointNV (VkCommandBuffer commandBuffer, const void
        m_vk.cmdSetCheckpointNV(commandBuffer, pCheckpointMarker);
 }
 
-void DeviceDriver::getQueueCheckpointDataNV (VkQueue queue, deUint32* pCheckpointDataCount, VkCheckpointDataNV* pCheckpointData) const
+void DeviceDriver::getQueueCheckpointDataNV (VkQueue queue, uint32_t* pCheckpointDataCount, VkCheckpointDataNV* pCheckpointData) const
 {
        m_vk.getQueueCheckpointDataNV(queue, pCheckpointDataCount, pCheckpointData);
 }
@@ -1377,7 +1377,7 @@ VkDeviceAddress DeviceDriver::getBufferDeviceAddressEXT (VkDevice device, const
        return m_vk.getBufferDeviceAddressEXT(device, pInfo);
 }
 
-void DeviceDriver::cmdSetLineStippleEXT (VkCommandBuffer commandBuffer, deUint32 lineStippleFactor, deUint16 lineStipplePattern) const
+void DeviceDriver::cmdSetLineStippleEXT (VkCommandBuffer commandBuffer, uint32_t lineStippleFactor, deUint16 lineStipplePattern) const
 {
        m_vk.cmdSetLineStippleEXT(commandBuffer, lineStippleFactor, lineStipplePattern);
 }
@@ -1397,17 +1397,17 @@ void DeviceDriver::cmdSetPrimitiveTopologyEXT (VkCommandBuffer commandBuffer, Vk
        m_vk.cmdSetPrimitiveTopologyEXT(commandBuffer, primitiveTopology);
 }
 
-void DeviceDriver::cmdSetViewportWithCountEXT (VkCommandBuffer commandBuffer, deUint32 viewportCount, const VkViewport* pViewports) const
+void DeviceDriver::cmdSetViewportWithCountEXT (VkCommandBuffer commandBuffer, uint32_t viewportCount, const VkViewport* pViewports) const
 {
        m_vk.cmdSetViewportWithCountEXT(commandBuffer, viewportCount, pViewports);
 }
 
-void DeviceDriver::cmdSetScissorWithCountEXT (VkCommandBuffer commandBuffer, deUint32 scissorCount, const VkRect2D* pScissors) const
+void DeviceDriver::cmdSetScissorWithCountEXT (VkCommandBuffer commandBuffer, uint32_t scissorCount, const VkRect2D* pScissors) const
 {
        m_vk.cmdSetScissorWithCountEXT(commandBuffer, scissorCount, pScissors);
 }
 
-void DeviceDriver::cmdBindVertexBuffers2EXT (VkCommandBuffer commandBuffer, deUint32 firstBinding, deUint32 bindingCount, const VkBuffer* pBuffers, const VkDeviceSize* pOffsets, const VkDeviceSize* pSizes, const VkDeviceSize* pStrides) const
+void DeviceDriver::cmdBindVertexBuffers2EXT (VkCommandBuffer commandBuffer, uint32_t firstBinding, uint32_t bindingCount, const VkBuffer* pBuffers, const VkDeviceSize* pOffsets, const VkDeviceSize* pSizes, const VkDeviceSize* pStrides) const
 {
        m_vk.cmdBindVertexBuffers2EXT(commandBuffer, firstBinding, bindingCount, pBuffers, pOffsets, pSizes, pStrides);
 }
@@ -1457,7 +1457,7 @@ void DeviceDriver::cmdExecuteGeneratedCommandsNV (VkCommandBuffer commandBuffer,
        m_vk.cmdExecuteGeneratedCommandsNV(commandBuffer, isPreprocessed, pGeneratedCommandsInfo);
 }
 
-void DeviceDriver::cmdBindPipelineShaderGroupNV (VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline pipeline, deUint32 groupIndex) const
+void DeviceDriver::cmdBindPipelineShaderGroupNV (VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline pipeline, uint32_t groupIndex) const
 {
        m_vk.cmdBindPipelineShaderGroupNV(commandBuffer, pipelineBindPoint, pipeline, groupIndex);
 }
@@ -1497,7 +1497,7 @@ void DeviceDriver::cmdSetFragmentShadingRateEnumNV (VkCommandBuffer commandBuffe
        m_vk.cmdSetFragmentShadingRateEnumNV(commandBuffer, shadingRate, combinerOps);
 }
 
-void DeviceDriver::cmdSetVertexInputEXT (VkCommandBuffer commandBuffer, deUint32 vertexBindingDescriptionCount, const VkVertexInputBindingDescription2EXT* pVertexBindingDescriptions, deUint32 vertexAttributeDescriptionCount, const VkVertexInputAttributeDescription2EXT* pVertexAttributeDescriptions) const
+void DeviceDriver::cmdSetVertexInputEXT (VkCommandBuffer commandBuffer, uint32_t vertexBindingDescriptionCount, const VkVertexInputBindingDescription2EXT* pVertexBindingDescriptions, uint32_t vertexAttributeDescriptionCount, const VkVertexInputAttributeDescription2EXT* pVertexAttributeDescriptions) const
 {
        m_vk.cmdSetVertexInputEXT(commandBuffer, vertexBindingDescriptionCount, pVertexBindingDescriptions, vertexAttributeDescriptionCount, pVertexAttributeDescriptions);
 }
@@ -1517,7 +1517,7 @@ VkResult DeviceDriver::getMemoryRemoteAddressNV (VkDevice device, const VkMemory
        return m_vk.getMemoryRemoteAddressNV(device, getMemoryRemoteAddressInfo, pAddress);
 }
 
-void DeviceDriver::cmdSetPatchControlPointsEXT (VkCommandBuffer commandBuffer, deUint32 patchControlPoints) const
+void DeviceDriver::cmdSetPatchControlPointsEXT (VkCommandBuffer commandBuffer, uint32_t patchControlPoints) const
 {
        m_vk.cmdSetPatchControlPointsEXT(commandBuffer, patchControlPoints);
 }
@@ -1542,17 +1542,17 @@ void DeviceDriver::cmdSetPrimitiveRestartEnableEXT (VkCommandBuffer commandBuffe
        m_vk.cmdSetPrimitiveRestartEnableEXT(commandBuffer, primitiveRestartEnable);
 }
 
-void DeviceDriver::cmdSetColorWriteEnableEXT (VkCommandBuffer commandBuffer, deUint32 attachmentCount, const VkBool32* pColorWriteEnables) const
+void DeviceDriver::cmdSetColorWriteEnableEXT (VkCommandBuffer commandBuffer, uint32_t attachmentCount, const VkBool32* pColorWriteEnables) const
 {
        m_vk.cmdSetColorWriteEnableEXT(commandBuffer, attachmentCount, pColorWriteEnables);
 }
 
-void DeviceDriver::cmdDrawMultiEXT (VkCommandBuffer commandBuffer, deUint32 drawCount, const VkMultiDrawInfoEXT* pVertexInfo, deUint32 instanceCount, deUint32 firstInstance, deUint32 stride) const
+void DeviceDriver::cmdDrawMultiEXT (VkCommandBuffer commandBuffer, uint32_t drawCount, const VkMultiDrawInfoEXT* pVertexInfo, uint32_t instanceCount, uint32_t firstInstance, uint32_t stride) const
 {
        m_vk.cmdDrawMultiEXT(commandBuffer, drawCount, pVertexInfo, instanceCount, firstInstance, stride);
 }
 
-void DeviceDriver::cmdDrawMultiIndexedEXT (VkCommandBuffer commandBuffer, deUint32 drawCount, const VkMultiDrawIndexedInfoEXT* pIndexInfo, deUint32 instanceCount, deUint32 firstInstance, deUint32 stride, const deInt32* pVertexOffset) const
+void DeviceDriver::cmdDrawMultiIndexedEXT (VkCommandBuffer commandBuffer, uint32_t drawCount, const VkMultiDrawIndexedInfoEXT* pIndexInfo, uint32_t instanceCount, uint32_t firstInstance, uint32_t stride, const int32_t* pVertexOffset) const
 {
        m_vk.cmdDrawMultiIndexedEXT(commandBuffer, drawCount, pIndexInfo, instanceCount, firstInstance, stride, pVertexOffset);
 }
@@ -1567,17 +1567,17 @@ void DeviceDriver::destroyAccelerationStructureKHR (VkDevice device, VkAccelerat
        m_vk.destroyAccelerationStructureKHR(device, accelerationStructure, pAllocator);
 }
 
-void DeviceDriver::cmdBuildAccelerationStructuresKHR (VkCommandBuffer commandBuffer, deUint32 infoCount, const VkAccelerationStructureBuildGeometryInfoKHR* pInfos, const VkAccelerationStructureBuildRangeInfoKHR* const* ppBuildRangeInfos) const
+void DeviceDriver::cmdBuildAccelerationStructuresKHR (VkCommandBuffer commandBuffer, uint32_t infoCount, const VkAccelerationStructureBuildGeometryInfoKHR* pInfos, const VkAccelerationStructureBuildRangeInfoKHR* const* ppBuildRangeInfos) const
 {
        m_vk.cmdBuildAccelerationStructuresKHR(commandBuffer, infoCount, pInfos, ppBuildRangeInfos);
 }
 
-void DeviceDriver::cmdBuildAccelerationStructuresIndirectKHR (VkCommandBuffer commandBuffer, deUint32 infoCount, const VkAccelerationStructureBuildGeometryInfoKHR* pInfos, const VkDeviceAddress* pIndirectDeviceAddresses, const deUint32* pIndirectStrides, const deUint32* const* ppMaxPrimitiveCounts) const
+void DeviceDriver::cmdBuildAccelerationStructuresIndirectKHR (VkCommandBuffer commandBuffer, uint32_t infoCount, const VkAccelerationStructureBuildGeometryInfoKHR* pInfos, const VkDeviceAddress* pIndirectDeviceAddresses, const uint32_t* pIndirectStrides, const uint32_t* const* ppMaxPrimitiveCounts) const
 {
        m_vk.cmdBuildAccelerationStructuresIndirectKHR(commandBuffer, infoCount, pInfos, pIndirectDeviceAddresses, pIndirectStrides, ppMaxPrimitiveCounts);
 }
 
-VkResult DeviceDriver::buildAccelerationStructuresKHR (VkDevice device, VkDeferredOperationKHR deferredOperation, deUint32 infoCount, const VkAccelerationStructureBuildGeometryInfoKHR* pInfos, const VkAccelerationStructureBuildRangeInfoKHR* const* ppBuildRangeInfos) const
+VkResult DeviceDriver::buildAccelerationStructuresKHR (VkDevice device, VkDeferredOperationKHR deferredOperation, uint32_t infoCount, const VkAccelerationStructureBuildGeometryInfoKHR* pInfos, const VkAccelerationStructureBuildRangeInfoKHR* const* ppBuildRangeInfos) const
 {
        return m_vk.buildAccelerationStructuresKHR(device, deferredOperation, infoCount, pInfos, ppBuildRangeInfos);
 }
@@ -1597,7 +1597,7 @@ VkResult DeviceDriver::copyMemoryToAccelerationStructureKHR (VkDevice device, Vk
        return m_vk.copyMemoryToAccelerationStructureKHR(device, deferredOperation, pInfo);
 }
 
-VkResult DeviceDriver::writeAccelerationStructuresPropertiesKHR (VkDevice device, deUint32 accelerationStructureCount, const VkAccelerationStructureKHR* pAccelerationStructures, VkQueryType queryType, deUintptr dataSize, void* pData, deUintptr stride) const
+VkResult DeviceDriver::writeAccelerationStructuresPropertiesKHR (VkDevice device, uint32_t accelerationStructureCount, const VkAccelerationStructureKHR* pAccelerationStructures, VkQueryType queryType, deUintptr dataSize, void* pData, deUintptr stride) const
 {
        return m_vk.writeAccelerationStructuresPropertiesKHR(device, accelerationStructureCount, pAccelerationStructures, queryType, dataSize, pData, stride);
 }
@@ -1622,7 +1622,7 @@ VkDeviceAddress DeviceDriver::getAccelerationStructureDeviceAddressKHR (VkDevice
        return m_vk.getAccelerationStructureDeviceAddressKHR(device, pInfo);
 }
 
-void DeviceDriver::cmdWriteAccelerationStructuresPropertiesKHR (VkCommandBuffer commandBuffer, deUint32 accelerationStructureCount, const VkAccelerationStructureKHR* pAccelerationStructures, VkQueryType queryType, VkQueryPool queryPool, deUint32 firstQuery) const
+void DeviceDriver::cmdWriteAccelerationStructuresPropertiesKHR (VkCommandBuffer commandBuffer, uint32_t accelerationStructureCount, const VkAccelerationStructureKHR* pAccelerationStructures, VkQueryType queryType, VkQueryPool queryPool, uint32_t firstQuery) const
 {
        m_vk.cmdWriteAccelerationStructuresPropertiesKHR(commandBuffer, accelerationStructureCount, pAccelerationStructures, queryType, queryPool, firstQuery);
 }
@@ -1632,22 +1632,22 @@ void DeviceDriver::getDeviceAccelerationStructureCompatibilityKHR (VkDevice devi
        m_vk.getDeviceAccelerationStructureCompatibilityKHR(device, pVersionInfo, pCompatibility);
 }
 
-void DeviceDriver::getAccelerationStructureBuildSizesKHR (VkDevice device, VkAccelerationStructureBuildTypeKHR buildType, const VkAccelerationStructureBuildGeometryInfoKHR* pBuildInfo, const deUint32* pMaxPrimitiveCounts, VkAccelerationStructureBuildSizesInfoKHR* pSizeInfo) const
+void DeviceDriver::getAccelerationStructureBuildSizesKHR (VkDevice device, VkAccelerationStructureBuildTypeKHR buildType, const VkAccelerationStructureBuildGeometryInfoKHR* pBuildInfo, const uint32_t* pMaxPrimitiveCounts, VkAccelerationStructureBuildSizesInfoKHR* pSizeInfo) const
 {
        m_vk.getAccelerationStructureBuildSizesKHR(device, buildType, pBuildInfo, pMaxPrimitiveCounts, pSizeInfo);
 }
 
-void DeviceDriver::cmdTraceRaysKHR (VkCommandBuffer commandBuffer, const VkStridedDeviceAddressRegionKHR* pRaygenShaderBindingTable, const VkStridedDeviceAddressRegionKHR* pMissShaderBindingTable, const VkStridedDeviceAddressRegionKHR* pHitShaderBindingTable, const VkStridedDeviceAddressRegionKHR* pCallableShaderBindingTable, deUint32 width, deUint32 height, deUint32 depth) const
+void DeviceDriver::cmdTraceRaysKHR (VkCommandBuffer commandBuffer, const VkStridedDeviceAddressRegionKHR* pRaygenShaderBindingTable, const VkStridedDeviceAddressRegionKHR* pMissShaderBindingTable, const VkStridedDeviceAddressRegionKHR* pHitShaderBindingTable, const VkStridedDeviceAddressRegionKHR* pCallableShaderBindingTable, uint32_t width, uint32_t height, uint32_t depth) const
 {
        m_vk.cmdTraceRaysKHR(commandBuffer, pRaygenShaderBindingTable, pMissShaderBindingTable, pHitShaderBindingTable, pCallableShaderBindingTable, width, height, depth);
 }
 
-VkResult DeviceDriver::createRayTracingPipelinesKHR (VkDevice device, VkDeferredOperationKHR deferredOperation, VkPipelineCache pipelineCache, deUint32 createInfoCount, const VkRayTracingPipelineCreateInfoKHR* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkPipeline* pPipelines) const
+VkResult DeviceDriver::createRayTracingPipelinesKHR (VkDevice device, VkDeferredOperationKHR deferredOperation, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkRayTracingPipelineCreateInfoKHR* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkPipeline* pPipelines) const
 {
        return m_vk.createRayTracingPipelinesKHR(device, deferredOperation, pipelineCache, createInfoCount, pCreateInfos, pAllocator, pPipelines);
 }
 
-VkResult DeviceDriver::getRayTracingCaptureReplayShaderGroupHandlesKHR (VkDevice device, VkPipeline pipeline, deUint32 firstGroup, deUint32 groupCount, deUintptr dataSize, void* pData) const
+VkResult DeviceDriver::getRayTracingCaptureReplayShaderGroupHandlesKHR (VkDevice device, VkPipeline pipeline, uint32_t firstGroup, uint32_t groupCount, deUintptr dataSize, void* pData) const
 {
        return m_vk.getRayTracingCaptureReplayShaderGroupHandlesKHR(device, pipeline, firstGroup, groupCount, dataSize, pData);
 }
@@ -1657,12 +1657,12 @@ void DeviceDriver::cmdTraceRaysIndirectKHR (VkCommandBuffer commandBuffer, const
        m_vk.cmdTraceRaysIndirectKHR(commandBuffer, pRaygenShaderBindingTable, pMissShaderBindingTable, pHitShaderBindingTable, pCallableShaderBindingTable, indirectDeviceAddress);
 }
 
-VkDeviceSize DeviceDriver::getRayTracingShaderGroupStackSizeKHR (VkDevice device, VkPipeline pipeline, deUint32 group, VkShaderGroupShaderKHR groupShader) const
+VkDeviceSize DeviceDriver::getRayTracingShaderGroupStackSizeKHR (VkDevice device, VkPipeline pipeline, uint32_t group, VkShaderGroupShaderKHR groupShader) const
 {
        return m_vk.getRayTracingShaderGroupStackSizeKHR(device, pipeline, group, groupShader);
 }
 
-void DeviceDriver::cmdSetRayTracingPipelineStackSizeKHR (VkCommandBuffer commandBuffer, deUint32 pipelineStackSize) const
+void DeviceDriver::cmdSetRayTracingPipelineStackSizeKHR (VkCommandBuffer commandBuffer, uint32_t pipelineStackSize) const
 {
        m_vk.cmdSetRayTracingPipelineStackSizeKHR(commandBuffer, pipelineStackSize);
 }
@@ -1687,12 +1687,12 @@ void DeviceDriver::destroyVideoSessionKHR (VkDevice device, VkVideoSessionKHR vi
        m_vk.destroyVideoSessionKHR(device, videoSession, pAllocator);
 }
 
-VkResult DeviceDriver::getVideoSessionMemoryRequirementsKHR (VkDevice device, VkVideoSessionKHR videoSession, deUint32* pVideoSessionMemoryRequirementsCount, VkVideoGetMemoryPropertiesKHR* pVideoSessionMemoryRequirements) const
+VkResult DeviceDriver::getVideoSessionMemoryRequirementsKHR (VkDevice device, VkVideoSessionKHR videoSession, uint32_t* pVideoSessionMemoryRequirementsCount, VkVideoGetMemoryPropertiesKHR* pVideoSessionMemoryRequirements) const
 {
        return m_vk.getVideoSessionMemoryRequirementsKHR(device, videoSession, pVideoSessionMemoryRequirementsCount, pVideoSessionMemoryRequirements);
 }
 
-VkResult DeviceDriver::bindVideoSessionMemoryKHR (VkDevice device, VkVideoSessionKHR videoSession, deUint32 videoSessionBindMemoryCount, const VkVideoBindMemoryKHR* pVideoSessionBindMemories) const
+VkResult DeviceDriver::bindVideoSessionMemoryKHR (VkDevice device, VkVideoSessionKHR videoSession, uint32_t videoSessionBindMemoryCount, const VkVideoBindMemoryKHR* pVideoSessionBindMemories) const
 {
        return m_vk.bindVideoSessionMemoryKHR(device, videoSession, videoSessionBindMemoryCount, pVideoSessionBindMemories);
 }
index 19e1f60..9120672 100644 (file)
@@ -2,7 +2,7 @@
  * be lost! Modify the generating script instead.
  */
 
-void getInstanceExtensionFunctions (deUint32 apiVersion, ::std::string extName, ::std::vector<const char*>& functions)
+void getInstanceExtensionFunctions (uint32_t apiVersion, ::std::string extName, ::std::vector<const char*>& functions)
 {
        if (extName == "VK_KHR_surface")
        {
@@ -1072,7 +1072,7 @@ void getInstanceExtensionFunctions (deUint32 apiVersion, ::std::string extName,
        DE_FATAL("Extension name not found");
 }
 
-void getDeviceExtensionFunctions (deUint32 apiVersion, ::std::string extName, ::std::vector<const char*>& functions)
+void getDeviceExtensionFunctions (uint32_t apiVersion, ::std::string extName, ::std::vector<const char*>& functions)
 {
        if (extName == "VK_KHR_surface")
        {
index 1007d12..6c0db25 100644 (file)
@@ -3,44 +3,44 @@
  */
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CreateInstanceFunc)                                                                                                        (const VkInstanceCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkInstance* pInstance);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* DestroyInstanceFunc)                                                                                                       (VkInstance instance, const VkAllocationCallbacks* pAllocator);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* EnumeratePhysicalDevicesFunc)                                                                                      (VkInstance instance, deUint32* pPhysicalDeviceCount, VkPhysicalDevice* pPhysicalDevices);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* EnumeratePhysicalDevicesFunc)                                                                                      (VkInstance instance, uint32_t* pPhysicalDeviceCount, VkPhysicalDevice* pPhysicalDevices);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetPhysicalDeviceFeaturesFunc)                                                                                     (VkPhysicalDevice physicalDevice, VkPhysicalDeviceFeatures* pFeatures);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetPhysicalDeviceFormatPropertiesFunc)                                                                     (VkPhysicalDevice physicalDevice, VkFormat format, VkFormatProperties* pFormatProperties);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPhysicalDeviceImageFormatPropertiesFunc)                                                        (VkPhysicalDevice physicalDevice, VkFormat format, VkImageType type, VkImageTiling tiling, VkImageUsageFlags usage, VkImageCreateFlags flags, VkImageFormatProperties* pImageFormatProperties);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetPhysicalDevicePropertiesFunc)                                                                           (VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties* pProperties);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetPhysicalDeviceQueueFamilyPropertiesFunc)                                                        (VkPhysicalDevice physicalDevice, deUint32* pQueueFamilyPropertyCount, VkQueueFamilyProperties* pQueueFamilyProperties);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetPhysicalDeviceQueueFamilyPropertiesFunc)                                                        (VkPhysicalDevice physicalDevice, uint32_t* pQueueFamilyPropertyCount, VkQueueFamilyProperties* pQueueFamilyProperties);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetPhysicalDeviceMemoryPropertiesFunc)                                                                     (VkPhysicalDevice physicalDevice, VkPhysicalDeviceMemoryProperties* pMemoryProperties);
 typedef VKAPI_ATTR PFN_vkVoidFunction  (VKAPI_CALL* GetInstanceProcAddrFunc)                                                                                           (VkInstance instance, const char* pName);
 typedef VKAPI_ATTR PFN_vkVoidFunction  (VKAPI_CALL* GetDeviceProcAddrFunc)                                                                                                     (VkDevice device, const char* pName);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CreateDeviceFunc)                                                                                                          (VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkDevice* pDevice);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* DestroyDeviceFunc)                                                                                                         (VkDevice device, const VkAllocationCallbacks* pAllocator);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* EnumerateInstanceExtensionPropertiesFunc)                                                          (const char* pLayerName, deUint32* pPropertyCount, VkExtensionProperties* pProperties);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* EnumerateDeviceExtensionPropertiesFunc)                                                            (VkPhysicalDevice physicalDevice, const char* pLayerName, deUint32* pPropertyCount, VkExtensionProperties* pProperties);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* EnumerateInstanceLayerPropertiesFunc)                                                                      (deUint32* pPropertyCount, VkLayerProperties* pProperties);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* EnumerateDeviceLayerPropertiesFunc)                                                                        (VkPhysicalDevice physicalDevice, deUint32* pPropertyCount, VkLayerProperties* pProperties);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetDeviceQueueFunc)                                                                                                        (VkDevice device, deUint32 queueFamilyIndex, deUint32 queueIndex, VkQueue* pQueue);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* QueueSubmitFunc)                                                                                                           (VkQueue queue, deUint32 submitCount, const VkSubmitInfo* pSubmits, VkFence fence);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* EnumerateInstanceExtensionPropertiesFunc)                                                          (const char* pLayerName, uint32_t* pPropertyCount, VkExtensionProperties* pProperties);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* EnumerateDeviceExtensionPropertiesFunc)                                                            (VkPhysicalDevice physicalDevice, const char* pLayerName, uint32_t* pPropertyCount, VkExtensionProperties* pProperties);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* EnumerateInstanceLayerPropertiesFunc)                                                                      (uint32_t* pPropertyCount, VkLayerProperties* pProperties);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* EnumerateDeviceLayerPropertiesFunc)                                                                        (VkPhysicalDevice physicalDevice, uint32_t* pPropertyCount, VkLayerProperties* pProperties);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetDeviceQueueFunc)                                                                                                        (VkDevice device, uint32_t queueFamilyIndex, uint32_t queueIndex, VkQueue* pQueue);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* QueueSubmitFunc)                                                                                                           (VkQueue queue, uint32_t submitCount, const VkSubmitInfo* pSubmits, VkFence fence);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* QueueWaitIdleFunc)                                                                                                         (VkQueue queue);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* DeviceWaitIdleFunc)                                                                                                        (VkDevice device);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* AllocateMemoryFunc)                                                                                                        (VkDevice device, const VkMemoryAllocateInfo* pAllocateInfo, const VkAllocationCallbacks* pAllocator, VkDeviceMemory* pMemory);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* FreeMemoryFunc)                                                                                                            (VkDevice device, VkDeviceMemory memory, const VkAllocationCallbacks* pAllocator);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* MapMemoryFunc)                                                                                                                     (VkDevice device, VkDeviceMemory memory, VkDeviceSize offset, VkDeviceSize size, VkMemoryMapFlags flags, void** ppData);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* UnmapMemoryFunc)                                                                                                           (VkDevice device, VkDeviceMemory memory);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* FlushMappedMemoryRangesFunc)                                                                                       (VkDevice device, deUint32 memoryRangeCount, const VkMappedMemoryRange* pMemoryRanges);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* InvalidateMappedMemoryRangesFunc)                                                                          (VkDevice device, deUint32 memoryRangeCount, const VkMappedMemoryRange* pMemoryRanges);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* FlushMappedMemoryRangesFunc)                                                                                       (VkDevice device, uint32_t memoryRangeCount, const VkMappedMemoryRange* pMemoryRanges);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* InvalidateMappedMemoryRangesFunc)                                                                          (VkDevice device, uint32_t memoryRangeCount, const VkMappedMemoryRange* pMemoryRanges);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetDeviceMemoryCommitmentFunc)                                                                                     (VkDevice device, VkDeviceMemory memory, VkDeviceSize* pCommittedMemoryInBytes);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* BindBufferMemoryFunc)                                                                                                      (VkDevice device, VkBuffer buffer, VkDeviceMemory memory, VkDeviceSize memoryOffset);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* BindImageMemoryFunc)                                                                                                       (VkDevice device, VkImage image, VkDeviceMemory memory, VkDeviceSize memoryOffset);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetBufferMemoryRequirementsFunc)                                                                           (VkDevice device, VkBuffer buffer, VkMemoryRequirements* pMemoryRequirements);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetImageMemoryRequirementsFunc)                                                                            (VkDevice device, VkImage image, VkMemoryRequirements* pMemoryRequirements);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetImageSparseMemoryRequirementsFunc)                                                                      (VkDevice device, VkImage image, deUint32* pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements* pSparseMemoryRequirements);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetPhysicalDeviceSparseImageFormatPropertiesFunc)                                          (VkPhysicalDevice physicalDevice, VkFormat format, VkImageType type, VkSampleCountFlagBits samples, VkImageUsageFlags usage, VkImageTiling tiling, deUint32* pPropertyCount, VkSparseImageFormatProperties* pProperties);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* QueueBindSparseFunc)                                                                                                       (VkQueue queue, deUint32 bindInfoCount, const VkBindSparseInfo* pBindInfo, VkFence fence);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetImageSparseMemoryRequirementsFunc)                                                                      (VkDevice device, VkImage image, uint32_t* pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements* pSparseMemoryRequirements);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetPhysicalDeviceSparseImageFormatPropertiesFunc)                                          (VkPhysicalDevice physicalDevice, VkFormat format, VkImageType type, VkSampleCountFlagBits samples, VkImageUsageFlags usage, VkImageTiling tiling, uint32_t* pPropertyCount, VkSparseImageFormatProperties* pProperties);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* QueueBindSparseFunc)                                                                                                       (VkQueue queue, uint32_t bindInfoCount, const VkBindSparseInfo* pBindInfo, VkFence fence);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CreateFenceFunc)                                                                                                           (VkDevice device, const VkFenceCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkFence* pFence);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* DestroyFenceFunc)                                                                                                          (VkDevice device, VkFence fence, const VkAllocationCallbacks* pAllocator);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* ResetFencesFunc)                                                                                                           (VkDevice device, deUint32 fenceCount, const VkFence* pFences);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* ResetFencesFunc)                                                                                                           (VkDevice device, uint32_t fenceCount, const VkFence* pFences);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetFenceStatusFunc)                                                                                                        (VkDevice device, VkFence fence);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* WaitForFencesFunc)                                                                                                         (VkDevice device, deUint32 fenceCount, const VkFence* pFences, VkBool32 waitAll, deUint64 timeout);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* WaitForFencesFunc)                                                                                                         (VkDevice device, uint32_t fenceCount, const VkFence* pFences, VkBool32 waitAll, deUint64 timeout);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CreateSemaphoreFunc)                                                                                                       (VkDevice device, const VkSemaphoreCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSemaphore* pSemaphore);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* DestroySemaphoreFunc)                                                                                                      (VkDevice device, VkSemaphore semaphore, const VkAllocationCallbacks* pAllocator);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CreateEventFunc)                                                                                                           (VkDevice device, const VkEventCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkEvent* pEvent);
@@ -50,7 +50,7 @@ typedef VKAPI_ATTR VkResult                           (VKAPI_CALL* SetEventFunc)                                                                                                                      (VkDevic
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* ResetEventFunc)                                                                                                            (VkDevice device, VkEvent event);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CreateQueryPoolFunc)                                                                                                       (VkDevice device, const VkQueryPoolCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkQueryPool* pQueryPool);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* DestroyQueryPoolFunc)                                                                                                      (VkDevice device, VkQueryPool queryPool, const VkAllocationCallbacks* pAllocator);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetQueryPoolResultsFunc)                                                                                           (VkDevice device, VkQueryPool queryPool, deUint32 firstQuery, deUint32 queryCount, deUintptr dataSize, void* pData, VkDeviceSize stride, VkQueryResultFlags flags);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetQueryPoolResultsFunc)                                                                                           (VkDevice device, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount, deUintptr dataSize, void* pData, VkDeviceSize stride, VkQueryResultFlags flags);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CreateBufferFunc)                                                                                                          (VkDevice device, const VkBufferCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkBuffer* pBuffer);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* DestroyBufferFunc)                                                                                                         (VkDevice device, VkBuffer buffer, const VkAllocationCallbacks* pAllocator);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CreateBufferViewFunc)                                                                                                      (VkDevice device, const VkBufferViewCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkBufferView* pView);
@@ -65,9 +65,9 @@ typedef VKAPI_ATTR void                                       (VKAPI_CALL* DestroyShaderModuleFunc)                                                                                           (Vk
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CreatePipelineCacheFunc)                                                                                           (VkDevice device, const VkPipelineCacheCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkPipelineCache* pPipelineCache);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* DestroyPipelineCacheFunc)                                                                                          (VkDevice device, VkPipelineCache pipelineCache, const VkAllocationCallbacks* pAllocator);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPipelineCacheDataFunc)                                                                                          (VkDevice device, VkPipelineCache pipelineCache, deUintptr* pDataSize, void* pData);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* MergePipelineCachesFunc)                                                                                           (VkDevice device, VkPipelineCache dstCache, deUint32 srcCacheCount, const VkPipelineCache* pSrcCaches);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CreateGraphicsPipelinesFunc)                                                                                       (VkDevice device, VkPipelineCache pipelineCache, deUint32 createInfoCount, const VkGraphicsPipelineCreateInfo* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkPipeline* pPipelines);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CreateComputePipelinesFunc)                                                                                        (VkDevice device, VkPipelineCache pipelineCache, deUint32 createInfoCount, const VkComputePipelineCreateInfo* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkPipeline* pPipelines);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* MergePipelineCachesFunc)                                                                                           (VkDevice device, VkPipelineCache dstCache, uint32_t srcCacheCount, const VkPipelineCache* pSrcCaches);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CreateGraphicsPipelinesFunc)                                                                                       (VkDevice device, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkGraphicsPipelineCreateInfo* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkPipeline* pPipelines);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CreateComputePipelinesFunc)                                                                                        (VkDevice device, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkComputePipelineCreateInfo* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkPipeline* pPipelines);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* DestroyPipelineFunc)                                                                                                       (VkDevice device, VkPipeline pipeline, const VkAllocationCallbacks* pAllocator);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CreatePipelineLayoutFunc)                                                                                          (VkDevice device, const VkPipelineLayoutCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkPipelineLayout* pPipelineLayout);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* DestroyPipelineLayoutFunc)                                                                                         (VkDevice device, VkPipelineLayout pipelineLayout, const VkAllocationCallbacks* pAllocator);
@@ -79,8 +79,8 @@ typedef VKAPI_ATTR VkResult                           (VKAPI_CALL* CreateDescriptorPoolFunc)
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* DestroyDescriptorPoolFunc)                                                                                         (VkDevice device, VkDescriptorPool descriptorPool, const VkAllocationCallbacks* pAllocator);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* ResetDescriptorPoolFunc)                                                                                           (VkDevice device, VkDescriptorPool descriptorPool, VkDescriptorPoolResetFlags flags);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* AllocateDescriptorSetsFunc)                                                                                        (VkDevice device, const VkDescriptorSetAllocateInfo* pAllocateInfo, VkDescriptorSet* pDescriptorSets);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* FreeDescriptorSetsFunc)                                                                                            (VkDevice device, VkDescriptorPool descriptorPool, deUint32 descriptorSetCount, const VkDescriptorSet* pDescriptorSets);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* UpdateDescriptorSetsFunc)                                                                                          (VkDevice device, deUint32 descriptorWriteCount, const VkWriteDescriptorSet* pDescriptorWrites, deUint32 descriptorCopyCount, const VkCopyDescriptorSet* pDescriptorCopies);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* FreeDescriptorSetsFunc)                                                                                            (VkDevice device, VkDescriptorPool descriptorPool, uint32_t descriptorSetCount, const VkDescriptorSet* pDescriptorSets);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* UpdateDescriptorSetsFunc)                                                                                          (VkDevice device, uint32_t descriptorWriteCount, const VkWriteDescriptorSet* pDescriptorWrites, uint32_t descriptorCopyCount, const VkCopyDescriptorSet* pDescriptorCopies);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CreateFramebufferFunc)                                                                                                     (VkDevice device, const VkFramebufferCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkFramebuffer* pFramebuffer);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* DestroyFramebufferFunc)                                                                                            (VkDevice device, VkFramebuffer framebuffer, const VkAllocationCallbacks* pAllocator);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CreateRenderPassFunc)                                                                                                      (VkDevice device, const VkRenderPassCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkRenderPass* pRenderPass);
@@ -90,71 +90,71 @@ typedef VKAPI_ATTR VkResult                         (VKAPI_CALL* CreateCommandPoolFunc)                                                                                                     (
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* DestroyCommandPoolFunc)                                                                                            (VkDevice device, VkCommandPool commandPool, const VkAllocationCallbacks* pAllocator);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* ResetCommandPoolFunc)                                                                                                      (VkDevice device, VkCommandPool commandPool, VkCommandPoolResetFlags flags);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* AllocateCommandBuffersFunc)                                                                                        (VkDevice device, const VkCommandBufferAllocateInfo* pAllocateInfo, VkCommandBuffer* pCommandBuffers);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* FreeCommandBuffersFunc)                                                                                            (VkDevice device, VkCommandPool commandPool, deUint32 commandBufferCount, const VkCommandBuffer* pCommandBuffers);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* FreeCommandBuffersFunc)                                                                                            (VkDevice device, VkCommandPool commandPool, uint32_t commandBufferCount, const VkCommandBuffer* pCommandBuffers);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* BeginCommandBufferFunc)                                                                                            (VkCommandBuffer commandBuffer, const VkCommandBufferBeginInfo* pBeginInfo);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* EndCommandBufferFunc)                                                                                                      (VkCommandBuffer commandBuffer);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* ResetCommandBufferFunc)                                                                                            (VkCommandBuffer commandBuffer, VkCommandBufferResetFlags flags);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdBindPipelineFunc)                                                                                                       (VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline pipeline);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetViewportFunc)                                                                                                        (VkCommandBuffer commandBuffer, deUint32 firstViewport, deUint32 viewportCount, const VkViewport* pViewports);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetScissorFunc)                                                                                                         (VkCommandBuffer commandBuffer, deUint32 firstScissor, deUint32 scissorCount, const VkRect2D* pScissors);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetViewportFunc)                                                                                                        (VkCommandBuffer commandBuffer, uint32_t firstViewport, uint32_t viewportCount, const VkViewport* pViewports);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetScissorFunc)                                                                                                         (VkCommandBuffer commandBuffer, uint32_t firstScissor, uint32_t scissorCount, const VkRect2D* pScissors);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetLineWidthFunc)                                                                                                       (VkCommandBuffer commandBuffer, float lineWidth);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetDepthBiasFunc)                                                                                                       (VkCommandBuffer commandBuffer, float depthBiasConstantFactor, float depthBiasClamp, float depthBiasSlopeFactor);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetBlendConstantsFunc)                                                                                          (VkCommandBuffer commandBuffer, const float blendConstants[4]);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetDepthBoundsFunc)                                                                                                     (VkCommandBuffer commandBuffer, float minDepthBounds, float maxDepthBounds);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetStencilCompareMaskFunc)                                                                                      (VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, deUint32 compareMask);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetStencilWriteMaskFunc)                                                                                        (VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, deUint32 writeMask);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetStencilReferenceFunc)                                                                                        (VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, deUint32 reference);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdBindDescriptorSetsFunc)                                                                                         (VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, deUint32 firstSet, deUint32 descriptorSetCount, const VkDescriptorSet* pDescriptorSets, deUint32 dynamicOffsetCount, const deUint32* pDynamicOffsets);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetStencilCompareMaskFunc)                                                                                      (VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t compareMask);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetStencilWriteMaskFunc)                                                                                        (VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t writeMask);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetStencilReferenceFunc)                                                                                        (VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t reference);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdBindDescriptorSetsFunc)                                                                                         (VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, uint32_t firstSet, uint32_t descriptorSetCount, const VkDescriptorSet* pDescriptorSets, uint32_t dynamicOffsetCount, const uint32_t* pDynamicOffsets);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdBindIndexBufferFunc)                                                                                            (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkIndexType indexType);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdBindVertexBuffersFunc)                                                                                          (VkCommandBuffer commandBuffer, deUint32 firstBinding, deUint32 bindingCount, const VkBuffer* pBuffers, const VkDeviceSize* pOffsets);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdDrawFunc)                                                                                                                       (VkCommandBuffer commandBuffer, deUint32 vertexCount, deUint32 instanceCount, deUint32 firstVertex, deUint32 firstInstance);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdDrawIndexedFunc)                                                                                                        (VkCommandBuffer commandBuffer, deUint32 indexCount, deUint32 instanceCount, deUint32 firstIndex, deInt32 vertexOffset, deUint32 firstInstance);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdDrawIndirectFunc)                                                                                                       (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, deUint32 drawCount, deUint32 stride);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdDrawIndexedIndirectFunc)                                                                                        (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, deUint32 drawCount, deUint32 stride);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdDispatchFunc)                                                                                                           (VkCommandBuffer commandBuffer, deUint32 groupCountX, deUint32 groupCountY, deUint32 groupCountZ);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdBindVertexBuffersFunc)                                                                                          (VkCommandBuffer commandBuffer, uint32_t firstBinding, uint32_t bindingCount, const VkBuffer* pBuffers, const VkDeviceSize* pOffsets);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdDrawFunc)                                                                                                                       (VkCommandBuffer commandBuffer, uint32_t vertexCount, uint32_t instanceCount, uint32_t firstVertex, uint32_t firstInstance);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdDrawIndexedFunc)                                                                                                        (VkCommandBuffer commandBuffer, uint32_t indexCount, uint32_t instanceCount, uint32_t firstIndex, int32_t vertexOffset, uint32_t firstInstance);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdDrawIndirectFunc)                                                                                                       (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdDrawIndexedIndirectFunc)                                                                                        (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdDispatchFunc)                                                                                                           (VkCommandBuffer commandBuffer, uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdDispatchIndirectFunc)                                                                                           (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdCopyBufferFunc)                                                                                                         (VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkBuffer dstBuffer, deUint32 regionCount, const VkBufferCopy* pRegions);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdCopyImageFunc)                                                                                                          (VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, deUint32 regionCount, const VkImageCopy* pRegions);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdBlitImageFunc)                                                                                                          (VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, deUint32 regionCount, const VkImageBlit* pRegions, VkFilter filter);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdCopyBufferToImageFunc)                                                                                          (VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkImage dstImage, VkImageLayout dstImageLayout, deUint32 regionCount, const VkBufferImageCopy* pRegions);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdCopyImageToBufferFunc)                                                                                          (VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkBuffer dstBuffer, deUint32 regionCount, const VkBufferImageCopy* pRegions);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdCopyBufferFunc)                                                                                                         (VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkBuffer dstBuffer, uint32_t regionCount, const VkBufferCopy* pRegions);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdCopyImageFunc)                                                                                                          (VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageCopy* pRegions);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdBlitImageFunc)                                                                                                          (VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageBlit* pRegions, VkFilter filter);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdCopyBufferToImageFunc)                                                                                          (VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkBufferImageCopy* pRegions);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdCopyImageToBufferFunc)                                                                                          (VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkBuffer dstBuffer, uint32_t regionCount, const VkBufferImageCopy* pRegions);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdUpdateBufferFunc)                                                                                                       (VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize dataSize, const void* pData);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdFillBufferFunc)                                                                                                         (VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize size, deUint32 data);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdClearColorImageFunc)                                                                                            (VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearColorValue* pColor, deUint32 rangeCount, const VkImageSubresourceRange* pRanges);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdClearDepthStencilImageFunc)                                                                                     (VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearDepthStencilValue* pDepthStencil, deUint32 rangeCount, const VkImageSubresourceRange* pRanges);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdClearAttachmentsFunc)                                                                                           (VkCommandBuffer commandBuffer, deUint32 attachmentCount, const VkClearAttachment* pAttachments, deUint32 rectCount, const VkClearRect* pRects);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdResolveImageFunc)                                                                                                       (VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, deUint32 regionCount, const VkImageResolve* pRegions);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdFillBufferFunc)                                                                                                         (VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize size, uint32_t data);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdClearColorImageFunc)                                                                                            (VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearColorValue* pColor, uint32_t rangeCount, const VkImageSubresourceRange* pRanges);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdClearDepthStencilImageFunc)                                                                                     (VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearDepthStencilValue* pDepthStencil, uint32_t rangeCount, const VkImageSubresourceRange* pRanges);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdClearAttachmentsFunc)                                                                                           (VkCommandBuffer commandBuffer, uint32_t attachmentCount, const VkClearAttachment* pAttachments, uint32_t rectCount, const VkClearRect* pRects);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdResolveImageFunc)                                                                                                       (VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageResolve* pRegions);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetEventFunc)                                                                                                           (VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags stageMask);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdResetEventFunc)                                                                                                         (VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags stageMask);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdWaitEventsFunc)                                                                                                         (VkCommandBuffer commandBuffer, deUint32 eventCount, const VkEvent* pEvents, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, deUint32 memoryBarrierCount, const VkMemoryBarrier* pMemoryBarriers, deUint32 bufferMemoryBarrierCount, const VkBufferMemoryBarrier* pBufferMemoryBarriers, deUint32 imageMemoryBarrierCount, const VkImageMemoryBarrier* pImageMemoryBarriers);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdPipelineBarrierFunc)                                                                                            (VkCommandBuffer commandBuffer, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, VkDependencyFlags dependencyFlags, deUint32 memoryBarrierCount, const VkMemoryBarrier* pMemoryBarriers, deUint32 bufferMemoryBarrierCount, const VkBufferMemoryBarrier* pBufferMemoryBarriers, deUint32 imageMemoryBarrierCount, const VkImageMemoryBarrier* pImageMemoryBarriers);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdBeginQueryFunc)                                                                                                         (VkCommandBuffer commandBuffer, VkQueryPool queryPool, deUint32 query, VkQueryControlFlags flags);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdEndQueryFunc)                                                                                                           (VkCommandBuffer commandBuffer, VkQueryPool queryPool, deUint32 query);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdResetQueryPoolFunc)                                                                                                     (VkCommandBuffer commandBuffer, VkQueryPool queryPool, deUint32 firstQuery, deUint32 queryCount);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdWriteTimestampFunc)                                                                                                     (VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkQueryPool queryPool, deUint32 query);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdCopyQueryPoolResultsFunc)                                                                                       (VkCommandBuffer commandBuffer, VkQueryPool queryPool, deUint32 firstQuery, deUint32 queryCount, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize stride, VkQueryResultFlags flags);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdPushConstantsFunc)                                                                                                      (VkCommandBuffer commandBuffer, VkPipelineLayout layout, VkShaderStageFlags stageFlags, deUint32 offset, deUint32 size, const void* pValues);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdWaitEventsFunc)                                                                                                         (VkCommandBuffer commandBuffer, uint32_t eventCount, const VkEvent* pEvents, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, uint32_t memoryBarrierCount, const VkMemoryBarrier* pMemoryBarriers, uint32_t bufferMemoryBarrierCount, const VkBufferMemoryBarrier* pBufferMemoryBarriers, uint32_t imageMemoryBarrierCount, const VkImageMemoryBarrier* pImageMemoryBarriers);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdPipelineBarrierFunc)                                                                                            (VkCommandBuffer commandBuffer, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, VkDependencyFlags dependencyFlags, uint32_t memoryBarrierCount, const VkMemoryBarrier* pMemoryBarriers, uint32_t bufferMemoryBarrierCount, const VkBufferMemoryBarrier* pBufferMemoryBarriers, uint32_t imageMemoryBarrierCount, const VkImageMemoryBarrier* pImageMemoryBarriers);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdBeginQueryFunc)                                                                                                         (VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query, VkQueryControlFlags flags);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdEndQueryFunc)                                                                                                           (VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdResetQueryPoolFunc)                                                                                                     (VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdWriteTimestampFunc)                                                                                                     (VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkQueryPool queryPool, uint32_t query);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdCopyQueryPoolResultsFunc)                                                                                       (VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize stride, VkQueryResultFlags flags);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdPushConstantsFunc)                                                                                                      (VkCommandBuffer commandBuffer, VkPipelineLayout layout, VkShaderStageFlags stageFlags, uint32_t offset, uint32_t size, const void* pValues);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdBeginRenderPassFunc)                                                                                            (VkCommandBuffer commandBuffer, const VkRenderPassBeginInfo* pRenderPassBegin, VkSubpassContents contents);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdNextSubpassFunc)                                                                                                        (VkCommandBuffer commandBuffer, VkSubpassContents contents);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdEndRenderPassFunc)                                                                                                      (VkCommandBuffer commandBuffer);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdExecuteCommandsFunc)                                                                                            (VkCommandBuffer commandBuffer, deUint32 commandBufferCount, const VkCommandBuffer* pCommandBuffers);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* EnumerateInstanceVersionFunc)                                                                                      (deUint32* pApiVersion);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* BindBufferMemory2Func)                                                                                                     (VkDevice device, deUint32 bindInfoCount, const VkBindBufferMemoryInfo* pBindInfos);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* BindImageMemory2Func)                                                                                                      (VkDevice device, deUint32 bindInfoCount, const VkBindImageMemoryInfo* pBindInfos);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetDeviceGroupPeerMemoryFeaturesFunc)                                                                      (VkDevice device, deUint32 heapIndex, deUint32 localDeviceIndex, deUint32 remoteDeviceIndex, VkPeerMemoryFeatureFlags* pPeerMemoryFeatures);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetDeviceMaskFunc)                                                                                                      (VkCommandBuffer commandBuffer, deUint32 deviceMask);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdDispatchBaseFunc)                                                                                                       (VkCommandBuffer commandBuffer, deUint32 baseGroupX, deUint32 baseGroupY, deUint32 baseGroupZ, deUint32 groupCountX, deUint32 groupCountY, deUint32 groupCountZ);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* EnumeratePhysicalDeviceGroupsFunc)                                                                         (VkInstance instance, deUint32* pPhysicalDeviceGroupCount, VkPhysicalDeviceGroupProperties* pPhysicalDeviceGroupProperties);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdExecuteCommandsFunc)                                                                                            (VkCommandBuffer commandBuffer, uint32_t commandBufferCount, const VkCommandBuffer* pCommandBuffers);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* EnumerateInstanceVersionFunc)                                                                                      (uint32_t* pApiVersion);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* BindBufferMemory2Func)                                                                                                     (VkDevice device, uint32_t bindInfoCount, const VkBindBufferMemoryInfo* pBindInfos);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* BindImageMemory2Func)                                                                                                      (VkDevice device, uint32_t bindInfoCount, const VkBindImageMemoryInfo* pBindInfos);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetDeviceGroupPeerMemoryFeaturesFunc)                                                                      (VkDevice device, uint32_t heapIndex, uint32_t localDeviceIndex, uint32_t remoteDeviceIndex, VkPeerMemoryFeatureFlags* pPeerMemoryFeatures);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetDeviceMaskFunc)                                                                                                      (VkCommandBuffer commandBuffer, uint32_t deviceMask);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdDispatchBaseFunc)                                                                                                       (VkCommandBuffer commandBuffer, uint32_t baseGroupX, uint32_t baseGroupY, uint32_t baseGroupZ, uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* EnumeratePhysicalDeviceGroupsFunc)                                                                         (VkInstance instance, uint32_t* pPhysicalDeviceGroupCount, VkPhysicalDeviceGroupProperties* pPhysicalDeviceGroupProperties);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetImageMemoryRequirements2Func)                                                                           (VkDevice device, const VkImageMemoryRequirementsInfo2* pInfo, VkMemoryRequirements2* pMemoryRequirements);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetBufferMemoryRequirements2Func)                                                                          (VkDevice device, const VkBufferMemoryRequirementsInfo2* pInfo, VkMemoryRequirements2* pMemoryRequirements);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetImageSparseMemoryRequirements2Func)                                                                     (VkDevice device, const VkImageSparseMemoryRequirementsInfo2* pInfo, deUint32* pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements2* pSparseMemoryRequirements);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetImageSparseMemoryRequirements2Func)                                                                     (VkDevice device, const VkImageSparseMemoryRequirementsInfo2* pInfo, uint32_t* pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements2* pSparseMemoryRequirements);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetPhysicalDeviceFeatures2Func)                                                                            (VkPhysicalDevice physicalDevice, VkPhysicalDeviceFeatures2* pFeatures);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetPhysicalDeviceProperties2Func)                                                                          (VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2* pProperties);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetPhysicalDeviceFormatProperties2Func)                                                            (VkPhysicalDevice physicalDevice, VkFormat format, VkFormatProperties2* pFormatProperties);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPhysicalDeviceImageFormatProperties2Func)                                                       (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2* pImageFormatInfo, VkImageFormatProperties2* pImageFormatProperties);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetPhysicalDeviceQueueFamilyProperties2Func)                                                       (VkPhysicalDevice physicalDevice, deUint32* pQueueFamilyPropertyCount, VkQueueFamilyProperties2* pQueueFamilyProperties);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetPhysicalDeviceQueueFamilyProperties2Func)                                                       (VkPhysicalDevice physicalDevice, uint32_t* pQueueFamilyPropertyCount, VkQueueFamilyProperties2* pQueueFamilyProperties);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetPhysicalDeviceMemoryProperties2Func)                                                            (VkPhysicalDevice physicalDevice, VkPhysicalDeviceMemoryProperties2* pMemoryProperties);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetPhysicalDeviceSparseImageFormatProperties2Func)                                         (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSparseImageFormatInfo2* pFormatInfo, deUint32* pPropertyCount, VkSparseImageFormatProperties2* pProperties);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetPhysicalDeviceSparseImageFormatProperties2Func)                                         (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSparseImageFormatInfo2* pFormatInfo, uint32_t* pPropertyCount, VkSparseImageFormatProperties2* pProperties);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* TrimCommandPoolFunc)                                                                                                       (VkDevice device, VkCommandPool commandPool, VkCommandPoolTrimFlags flags);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetDeviceQueue2Func)                                                                                                       (VkDevice device, const VkDeviceQueueInfo2* pQueueInfo, VkQueue* pQueue);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CreateSamplerYcbcrConversionFunc)                                                                          (VkDevice device, const VkSamplerYcbcrConversionCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSamplerYcbcrConversion* pYcbcrConversion);
@@ -166,13 +166,13 @@ typedef VKAPI_ATTR void                                   (VKAPI_CALL* GetPhysicalDeviceExternalBufferProperti
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetPhysicalDeviceExternalFencePropertiesFunc)                                                      (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalFenceInfo* pExternalFenceInfo, VkExternalFenceProperties* pExternalFenceProperties);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetPhysicalDeviceExternalSemaphorePropertiesFunc)                                          (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalSemaphoreInfo* pExternalSemaphoreInfo, VkExternalSemaphoreProperties* pExternalSemaphoreProperties);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetDescriptorSetLayoutSupportFunc)                                                                         (VkDevice device, const VkDescriptorSetLayoutCreateInfo* pCreateInfo, VkDescriptorSetLayoutSupport* pSupport);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdDrawIndirectCountFunc)                                                                                          (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, deUint32 maxDrawCount, deUint32 stride);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdDrawIndexedIndirectCountFunc)                                                                           (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, deUint32 maxDrawCount, deUint32 stride);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdDrawIndirectCountFunc)                                                                                          (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdDrawIndexedIndirectCountFunc)                                                                           (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CreateRenderPass2Func)                                                                                                     (VkDevice device, const VkRenderPassCreateInfo2* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkRenderPass* pRenderPass);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdBeginRenderPass2Func)                                                                                           (VkCommandBuffer commandBuffer, const VkRenderPassBeginInfo* pRenderPassBegin, const VkSubpassBeginInfo* pSubpassBeginInfo);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdNextSubpass2Func)                                                                                                       (VkCommandBuffer commandBuffer, const VkSubpassBeginInfo* pSubpassBeginInfo, const VkSubpassEndInfo* pSubpassEndInfo);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdEndRenderPass2Func)                                                                                                     (VkCommandBuffer commandBuffer, const VkSubpassEndInfo* pSubpassEndInfo);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* ResetQueryPoolFunc)                                                                                                        (VkDevice device, VkQueryPool queryPool, deUint32 firstQuery, deUint32 queryCount);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* ResetQueryPoolFunc)                                                                                                        (VkDevice device, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetSemaphoreCounterValueFunc)                                                                                      (VkDevice device, VkSemaphore semaphore, deUint64* pValue);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* WaitSemaphoresFunc)                                                                                                        (VkDevice device, const VkSemaphoreWaitInfo* pWaitInfo, deUint64 timeout);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* SignalSemaphoreFunc)                                                                                                       (VkDevice device, const VkSemaphoreSignalInfo* pSignalInfo);
@@ -180,47 +180,47 @@ typedef VKAPI_ATTR VkDeviceAddress                (VKAPI_CALL* GetBufferDeviceAddressFunc)
 typedef VKAPI_ATTR uint64_t                            (VKAPI_CALL* GetBufferOpaqueCaptureAddressFunc)                                                                         (VkDevice device, const VkBufferDeviceAddressInfo* pInfo);
 typedef VKAPI_ATTR uint64_t                            (VKAPI_CALL* GetDeviceMemoryOpaqueCaptureAddressFunc)                                                           (VkDevice device, const VkDeviceMemoryOpaqueCaptureAddressInfo* pInfo);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* DestroySurfaceKHRFunc)                                                                                                     (VkInstance instance, VkSurfaceKHR surface, const VkAllocationCallbacks* pAllocator);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPhysicalDeviceSurfaceSupportKHRFunc)                                                            (VkPhysicalDevice physicalDevice, deUint32 queueFamilyIndex, VkSurfaceKHR surface, VkBool32* pSupported);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPhysicalDeviceSurfaceSupportKHRFunc)                                                            (VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, VkSurfaceKHR surface, VkBool32* pSupported);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPhysicalDeviceSurfaceCapabilitiesKHRFunc)                                                       (VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, VkSurfaceCapabilitiesKHR* pSurfaceCapabilities);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPhysicalDeviceSurfaceFormatsKHRFunc)                                                            (VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, deUint32* pSurfaceFormatCount, VkSurfaceFormatKHR* pSurfaceFormats);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPhysicalDeviceSurfacePresentModesKHRFunc)                                                       (VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, deUint32* pPresentModeCount, VkPresentModeKHR* pPresentModes);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPhysicalDeviceSurfaceFormatsKHRFunc)                                                            (VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, uint32_t* pSurfaceFormatCount, VkSurfaceFormatKHR* pSurfaceFormats);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPhysicalDeviceSurfacePresentModesKHRFunc)                                                       (VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, uint32_t* pPresentModeCount, VkPresentModeKHR* pPresentModes);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CreateSwapchainKHRFunc)                                                                                            (VkDevice device, const VkSwapchainCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSwapchainKHR* pSwapchain);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* DestroySwapchainKHRFunc)                                                                                           (VkDevice device, VkSwapchainKHR swapchain, const VkAllocationCallbacks* pAllocator);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetSwapchainImagesKHRFunc)                                                                                         (VkDevice device, VkSwapchainKHR swapchain, deUint32* pSwapchainImageCount, VkImage* pSwapchainImages);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* AcquireNextImageKHRFunc)                                                                                           (VkDevice device, VkSwapchainKHR swapchain, deUint64 timeout, VkSemaphore semaphore, VkFence fence, deUint32* pImageIndex);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetSwapchainImagesKHRFunc)                                                                                         (VkDevice device, VkSwapchainKHR swapchain, uint32_t* pSwapchainImageCount, VkImage* pSwapchainImages);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* AcquireNextImageKHRFunc)                                                                                           (VkDevice device, VkSwapchainKHR swapchain, deUint64 timeout, VkSemaphore semaphore, VkFence fence, uint32_t* pImageIndex);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* QueuePresentKHRFunc)                                                                                                       (VkQueue queue, const VkPresentInfoKHR* pPresentInfo);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetDeviceGroupPresentCapabilitiesKHRFunc)                                                          (VkDevice device, VkDeviceGroupPresentCapabilitiesKHR* pDeviceGroupPresentCapabilities);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetDeviceGroupSurfacePresentModesKHRFunc)                                                          (VkDevice device, VkSurfaceKHR surface, VkDeviceGroupPresentModeFlagsKHR* pModes);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPhysicalDevicePresentRectanglesKHRFunc)                                                         (VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, deUint32* pRectCount, VkRect2D* pRects);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* AcquireNextImage2KHRFunc)                                                                                          (VkDevice device, const VkAcquireNextImageInfoKHR* pAcquireInfo, deUint32* pImageIndex);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPhysicalDeviceDisplayPropertiesKHRFunc)                                                         (VkPhysicalDevice physicalDevice, deUint32* pPropertyCount, VkDisplayPropertiesKHR* pProperties);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPhysicalDeviceDisplayPlanePropertiesKHRFunc)                                            (VkPhysicalDevice physicalDevice, deUint32* pPropertyCount, VkDisplayPlanePropertiesKHR* pProperties);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetDisplayPlaneSupportedDisplaysKHRFunc)                                                           (VkPhysicalDevice physicalDevice, deUint32 planeIndex, deUint32* pDisplayCount, VkDisplayKHR* pDisplays);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetDisplayModePropertiesKHRFunc)                                                                           (VkPhysicalDevice physicalDevice, VkDisplayKHR display, deUint32* pPropertyCount, VkDisplayModePropertiesKHR* pProperties);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPhysicalDevicePresentRectanglesKHRFunc)                                                         (VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, uint32_t* pRectCount, VkRect2D* pRects);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* AcquireNextImage2KHRFunc)                                                                                          (VkDevice device, const VkAcquireNextImageInfoKHR* pAcquireInfo, uint32_t* pImageIndex);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPhysicalDeviceDisplayPropertiesKHRFunc)                                                         (VkPhysicalDevice physicalDevice, uint32_t* pPropertyCount, VkDisplayPropertiesKHR* pProperties);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPhysicalDeviceDisplayPlanePropertiesKHRFunc)                                            (VkPhysicalDevice physicalDevice, uint32_t* pPropertyCount, VkDisplayPlanePropertiesKHR* pProperties);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetDisplayPlaneSupportedDisplaysKHRFunc)                                                           (VkPhysicalDevice physicalDevice, uint32_t planeIndex, uint32_t* pDisplayCount, VkDisplayKHR* pDisplays);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetDisplayModePropertiesKHRFunc)                                                                           (VkPhysicalDevice physicalDevice, VkDisplayKHR display, uint32_t* pPropertyCount, VkDisplayModePropertiesKHR* pProperties);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CreateDisplayModeKHRFunc)                                                                                          (VkPhysicalDevice physicalDevice, VkDisplayKHR display, const VkDisplayModeCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkDisplayModeKHR* pMode);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetDisplayPlaneCapabilitiesKHRFunc)                                                                        (VkPhysicalDevice physicalDevice, VkDisplayModeKHR mode, deUint32 planeIndex, VkDisplayPlaneCapabilitiesKHR* pCapabilities);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetDisplayPlaneCapabilitiesKHRFunc)                                                                        (VkPhysicalDevice physicalDevice, VkDisplayModeKHR mode, uint32_t planeIndex, VkDisplayPlaneCapabilitiesKHR* pCapabilities);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CreateDisplayPlaneSurfaceKHRFunc)                                                                          (VkInstance instance, const VkDisplaySurfaceCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CreateSharedSwapchainsKHRFunc)                                                                                     (VkDevice device, deUint32 swapchainCount, const VkSwapchainCreateInfoKHR* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkSwapchainKHR* pSwapchains);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CreateSharedSwapchainsKHRFunc)                                                                                     (VkDevice device, uint32_t swapchainCount, const VkSwapchainCreateInfoKHR* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkSwapchainKHR* pSwapchains);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetPhysicalDeviceFeatures2KHRFunc)                                                                         (VkPhysicalDevice physicalDevice, VkPhysicalDeviceFeatures2* pFeatures);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetPhysicalDeviceProperties2KHRFunc)                                                                       (VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2* pProperties);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetPhysicalDeviceFormatProperties2KHRFunc)                                                         (VkPhysicalDevice physicalDevice, VkFormat format, VkFormatProperties2* pFormatProperties);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPhysicalDeviceImageFormatProperties2KHRFunc)                                            (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2* pImageFormatInfo, VkImageFormatProperties2* pImageFormatProperties);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetPhysicalDeviceQueueFamilyProperties2KHRFunc)                                            (VkPhysicalDevice physicalDevice, deUint32* pQueueFamilyPropertyCount, VkQueueFamilyProperties2* pQueueFamilyProperties);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetPhysicalDeviceQueueFamilyProperties2KHRFunc)                                            (VkPhysicalDevice physicalDevice, uint32_t* pQueueFamilyPropertyCount, VkQueueFamilyProperties2* pQueueFamilyProperties);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetPhysicalDeviceMemoryProperties2KHRFunc)                                                         (VkPhysicalDevice physicalDevice, VkPhysicalDeviceMemoryProperties2* pMemoryProperties);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetPhysicalDeviceSparseImageFormatProperties2KHRFunc)                                      (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSparseImageFormatInfo2* pFormatInfo, deUint32* pPropertyCount, VkSparseImageFormatProperties2* pProperties);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetDeviceGroupPeerMemoryFeaturesKHRFunc)                                                           (VkDevice device, deUint32 heapIndex, deUint32 localDeviceIndex, deUint32 remoteDeviceIndex, VkPeerMemoryFeatureFlags* pPeerMemoryFeatures);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetDeviceMaskKHRFunc)                                                                                           (VkCommandBuffer commandBuffer, deUint32 deviceMask);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdDispatchBaseKHRFunc)                                                                                            (VkCommandBuffer commandBuffer, deUint32 baseGroupX, deUint32 baseGroupY, deUint32 baseGroupZ, deUint32 groupCountX, deUint32 groupCountY, deUint32 groupCountZ);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetPhysicalDeviceSparseImageFormatProperties2KHRFunc)                                      (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSparseImageFormatInfo2* pFormatInfo, uint32_t* pPropertyCount, VkSparseImageFormatProperties2* pProperties);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetDeviceGroupPeerMemoryFeaturesKHRFunc)                                                           (VkDevice device, uint32_t heapIndex, uint32_t localDeviceIndex, uint32_t remoteDeviceIndex, VkPeerMemoryFeatureFlags* pPeerMemoryFeatures);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetDeviceMaskKHRFunc)                                                                                           (VkCommandBuffer commandBuffer, uint32_t deviceMask);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdDispatchBaseKHRFunc)                                                                                            (VkCommandBuffer commandBuffer, uint32_t baseGroupX, uint32_t baseGroupY, uint32_t baseGroupZ, uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* TrimCommandPoolKHRFunc)                                                                                            (VkDevice device, VkCommandPool commandPool, VkCommandPoolTrimFlags flags);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* EnumeratePhysicalDeviceGroupsKHRFunc)                                                                      (VkInstance instance, deUint32* pPhysicalDeviceGroupCount, VkPhysicalDeviceGroupProperties* pPhysicalDeviceGroupProperties);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* EnumeratePhysicalDeviceGroupsKHRFunc)                                                                      (VkInstance instance, uint32_t* pPhysicalDeviceGroupCount, VkPhysicalDeviceGroupProperties* pPhysicalDeviceGroupProperties);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetPhysicalDeviceExternalBufferPropertiesKHRFunc)                                          (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalBufferInfo* pExternalBufferInfo, VkExternalBufferProperties* pExternalBufferProperties);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetMemoryFdKHRFunc)                                                                                                        (VkDevice device, const VkMemoryGetFdInfoKHR* pGetFdInfo, int* pFd);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetMemoryFdPropertiesKHRFunc)                                                                                      (VkDevice device, VkExternalMemoryHandleTypeFlagBits handleType, int fd, VkMemoryFdPropertiesKHR* pMemoryFdProperties);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetPhysicalDeviceExternalSemaphorePropertiesKHRFunc)                                       (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalSemaphoreInfo* pExternalSemaphoreInfo, VkExternalSemaphoreProperties* pExternalSemaphoreProperties);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* ImportSemaphoreFdKHRFunc)                                                                                          (VkDevice device, const VkImportSemaphoreFdInfoKHR* pImportSemaphoreFdInfo);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetSemaphoreFdKHRFunc)                                                                                                     (VkDevice device, const VkSemaphoreGetFdInfoKHR* pGetFdInfo, int* pFd);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdPushDescriptorSetKHRFunc)                                                                                       (VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, deUint32 set, deUint32 descriptorWriteCount, const VkWriteDescriptorSet* pDescriptorWrites);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdPushDescriptorSetWithTemplateKHRFunc)                                                           (VkCommandBuffer commandBuffer, VkDescriptorUpdateTemplate descriptorUpdateTemplate, VkPipelineLayout layout, deUint32 set, const void* pData);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdPushDescriptorSetKHRFunc)                                                                                       (VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, uint32_t set, uint32_t descriptorWriteCount, const VkWriteDescriptorSet* pDescriptorWrites);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdPushDescriptorSetWithTemplateKHRFunc)                                                           (VkCommandBuffer commandBuffer, VkDescriptorUpdateTemplate descriptorUpdateTemplate, VkPipelineLayout layout, uint32_t set, const void* pData);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CreateDescriptorUpdateTemplateKHRFunc)                                                                     (VkDevice device, const VkDescriptorUpdateTemplateCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkDescriptorUpdateTemplate* pDescriptorUpdateTemplate);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* DestroyDescriptorUpdateTemplateKHRFunc)                                                            (VkDevice device, VkDescriptorUpdateTemplate descriptorUpdateTemplate, const VkAllocationCallbacks* pAllocator);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* UpdateDescriptorSetWithTemplateKHRFunc)                                                            (VkDevice device, VkDescriptorSet descriptorSet, VkDescriptorUpdateTemplate descriptorUpdateTemplate, const void* pData);
@@ -232,30 +232,30 @@ typedef VKAPI_ATTR VkResult                               (VKAPI_CALL* GetSwapchainStatusKHRFunc)
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetPhysicalDeviceExternalFencePropertiesKHRFunc)                                           (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalFenceInfo* pExternalFenceInfo, VkExternalFenceProperties* pExternalFenceProperties);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* ImportFenceFdKHRFunc)                                                                                                      (VkDevice device, const VkImportFenceFdInfoKHR* pImportFenceFdInfo);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetFenceFdKHRFunc)                                                                                                         (VkDevice device, const VkFenceGetFdInfoKHR* pGetFdInfo, int* pFd);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* EnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHRFunc)         (VkPhysicalDevice physicalDevice, deUint32 queueFamilyIndex, deUint32* pCounterCount, VkPerformanceCounterKHR* pCounters, VkPerformanceCounterDescriptionKHR* pCounterDescriptions);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHRFunc)                         (VkPhysicalDevice physicalDevice, const VkQueryPoolPerformanceCreateInfoKHR* pPerformanceQueryCreateInfo, deUint32* pNumPasses);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* EnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHRFunc)         (VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, uint32_t* pCounterCount, VkPerformanceCounterKHR* pCounters, VkPerformanceCounterDescriptionKHR* pCounterDescriptions);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHRFunc)                         (VkPhysicalDevice physicalDevice, const VkQueryPoolPerformanceCreateInfoKHR* pPerformanceQueryCreateInfo, uint32_t* pNumPasses);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* AcquireProfilingLockKHRFunc)                                                                                       (VkDevice device, const VkAcquireProfilingLockInfoKHR* pInfo);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* ReleaseProfilingLockKHRFunc)                                                                                       (VkDevice device);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPhysicalDeviceSurfaceCapabilities2KHRFunc)                                                      (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo, VkSurfaceCapabilities2KHR* pSurfaceCapabilities);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPhysicalDeviceSurfaceFormats2KHRFunc)                                                           (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo, deUint32* pSurfaceFormatCount, VkSurfaceFormat2KHR* pSurfaceFormats);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPhysicalDeviceDisplayProperties2KHRFunc)                                                        (VkPhysicalDevice physicalDevice, deUint32* pPropertyCount, VkDisplayProperties2KHR* pProperties);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPhysicalDeviceDisplayPlaneProperties2KHRFunc)                                           (VkPhysicalDevice physicalDevice, deUint32* pPropertyCount, VkDisplayPlaneProperties2KHR* pProperties);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetDisplayModeProperties2KHRFunc)                                                                          (VkPhysicalDevice physicalDevice, VkDisplayKHR display, deUint32* pPropertyCount, VkDisplayModeProperties2KHR* pProperties);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPhysicalDeviceSurfaceFormats2KHRFunc)                                                           (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo, uint32_t* pSurfaceFormatCount, VkSurfaceFormat2KHR* pSurfaceFormats);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPhysicalDeviceDisplayProperties2KHRFunc)                                                        (VkPhysicalDevice physicalDevice, uint32_t* pPropertyCount, VkDisplayProperties2KHR* pProperties);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPhysicalDeviceDisplayPlaneProperties2KHRFunc)                                           (VkPhysicalDevice physicalDevice, uint32_t* pPropertyCount, VkDisplayPlaneProperties2KHR* pProperties);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetDisplayModeProperties2KHRFunc)                                                                          (VkPhysicalDevice physicalDevice, VkDisplayKHR display, uint32_t* pPropertyCount, VkDisplayModeProperties2KHR* pProperties);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetDisplayPlaneCapabilities2KHRFunc)                                                                       (VkPhysicalDevice physicalDevice, const VkDisplayPlaneInfo2KHR* pDisplayPlaneInfo, VkDisplayPlaneCapabilities2KHR* pCapabilities);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetImageMemoryRequirements2KHRFunc)                                                                        (VkDevice device, const VkImageMemoryRequirementsInfo2* pInfo, VkMemoryRequirements2* pMemoryRequirements);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetBufferMemoryRequirements2KHRFunc)                                                                       (VkDevice device, const VkBufferMemoryRequirementsInfo2* pInfo, VkMemoryRequirements2* pMemoryRequirements);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetImageSparseMemoryRequirements2KHRFunc)                                                          (VkDevice device, const VkImageSparseMemoryRequirementsInfo2* pInfo, deUint32* pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements2* pSparseMemoryRequirements);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetImageSparseMemoryRequirements2KHRFunc)                                                          (VkDevice device, const VkImageSparseMemoryRequirementsInfo2* pInfo, uint32_t* pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements2* pSparseMemoryRequirements);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CreateSamplerYcbcrConversionKHRFunc)                                                                       (VkDevice device, const VkSamplerYcbcrConversionCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSamplerYcbcrConversion* pYcbcrConversion);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* DestroySamplerYcbcrConversionKHRFunc)                                                                      (VkDevice device, VkSamplerYcbcrConversion ycbcrConversion, const VkAllocationCallbacks* pAllocator);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* BindBufferMemory2KHRFunc)                                                                                          (VkDevice device, deUint32 bindInfoCount, const VkBindBufferMemoryInfo* pBindInfos);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* BindImageMemory2KHRFunc)                                                                                           (VkDevice device, deUint32 bindInfoCount, const VkBindImageMemoryInfo* pBindInfos);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* BindBufferMemory2KHRFunc)                                                                                          (VkDevice device, uint32_t bindInfoCount, const VkBindBufferMemoryInfo* pBindInfos);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* BindImageMemory2KHRFunc)                                                                                           (VkDevice device, uint32_t bindInfoCount, const VkBindImageMemoryInfo* pBindInfos);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetDescriptorSetLayoutSupportKHRFunc)                                                                      (VkDevice device, const VkDescriptorSetLayoutCreateInfo* pCreateInfo, VkDescriptorSetLayoutSupport* pSupport);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdDrawIndirectCountKHRFunc)                                                                                       (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, deUint32 maxDrawCount, deUint32 stride);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdDrawIndexedIndirectCountKHRFunc)                                                                        (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, deUint32 maxDrawCount, deUint32 stride);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdDrawIndirectCountKHRFunc)                                                                                       (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdDrawIndexedIndirectCountKHRFunc)                                                                        (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetSemaphoreCounterValueKHRFunc)                                                                           (VkDevice device, VkSemaphore semaphore, deUint64* pValue);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* WaitSemaphoresKHRFunc)                                                                                                     (VkDevice device, const VkSemaphoreWaitInfo* pWaitInfo, deUint64 timeout);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* SignalSemaphoreKHRFunc)                                                                                            (VkDevice device, const VkSemaphoreSignalInfo* pSignalInfo);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPhysicalDeviceFragmentShadingRatesKHRFunc)                                                      (VkPhysicalDevice physicalDevice, deUint32* pFragmentShadingRateCount, VkPhysicalDeviceFragmentShadingRateKHR* pFragmentShadingRates);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPhysicalDeviceFragmentShadingRatesKHRFunc)                                                      (VkPhysicalDevice physicalDevice, uint32_t* pFragmentShadingRateCount, VkPhysicalDeviceFragmentShadingRateKHR* pFragmentShadingRates);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetFragmentShadingRateKHRFunc)                                                                          (VkCommandBuffer commandBuffer, const VkExtent2D* pFragmentSize, const VkFragmentShadingRateCombinerOpKHR combinerOps[2]);
 typedef VKAPI_ATTR VkDeviceAddress             (VKAPI_CALL* GetBufferDeviceAddressKHRFunc)                                                                                     (VkDevice device, const VkBufferDeviceAddressInfo* pInfo);
 typedef VKAPI_ATTR uint64_t                            (VKAPI_CALL* GetBufferOpaqueCaptureAddressKHRFunc)                                                                      (VkDevice device, const VkBufferDeviceAddressInfo* pInfo);
@@ -265,17 +265,17 @@ typedef VKAPI_ATTR void                                   (VKAPI_CALL* DestroyDeferredOperationKHRFunc)
 typedef VKAPI_ATTR uint32_t                            (VKAPI_CALL* GetDeferredOperationMaxConcurrencyKHRFunc)                                                         (VkDevice device, VkDeferredOperationKHR operation);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetDeferredOperationResultKHRFunc)                                                                         (VkDevice device, VkDeferredOperationKHR operation);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* DeferredOperationJoinKHRFunc)                                                                                      (VkDevice device, VkDeferredOperationKHR operation);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPipelineExecutablePropertiesKHRFunc)                                                            (VkDevice device, const VkPipelineInfoKHR* pPipelineInfo, deUint32* pExecutableCount, VkPipelineExecutablePropertiesKHR* pProperties);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPipelineExecutableStatisticsKHRFunc)                                                            (VkDevice device, const VkPipelineExecutableInfoKHR* pExecutableInfo, deUint32* pStatisticCount, VkPipelineExecutableStatisticKHR* pStatistics);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPipelineExecutableInternalRepresentationsKHRFunc)                                       (VkDevice device, const VkPipelineExecutableInfoKHR* pExecutableInfo, deUint32* pInternalRepresentationCount, VkPipelineExecutableInternalRepresentationKHR* pInternalRepresentations);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPipelineExecutablePropertiesKHRFunc)                                                            (VkDevice device, const VkPipelineInfoKHR* pPipelineInfo, uint32_t* pExecutableCount, VkPipelineExecutablePropertiesKHR* pProperties);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPipelineExecutableStatisticsKHRFunc)                                                            (VkDevice device, const VkPipelineExecutableInfoKHR* pExecutableInfo, uint32_t* pStatisticCount, VkPipelineExecutableStatisticKHR* pStatistics);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPipelineExecutableInternalRepresentationsKHRFunc)                                       (VkDevice device, const VkPipelineExecutableInfoKHR* pExecutableInfo, uint32_t* pInternalRepresentationCount, VkPipelineExecutableInternalRepresentationKHR* pInternalRepresentations);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetEvent2KHRFunc)                                                                                                       (VkCommandBuffer commandBuffer, VkEvent event, const VkDependencyInfoKHR* pDependencyInfo);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdResetEvent2KHRFunc)                                                                                                     (VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags2KHR stageMask);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdWaitEvents2KHRFunc)                                                                                                     (VkCommandBuffer commandBuffer, deUint32 eventCount, const VkEvent* pEvents, const VkDependencyInfoKHR* pDependencyInfos);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdWaitEvents2KHRFunc)                                                                                                     (VkCommandBuffer commandBuffer, uint32_t eventCount, const VkEvent* pEvents, const VkDependencyInfoKHR* pDependencyInfos);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdPipelineBarrier2KHRFunc)                                                                                        (VkCommandBuffer commandBuffer, const VkDependencyInfoKHR* pDependencyInfo);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdWriteTimestamp2KHRFunc)                                                                                         (VkCommandBuffer commandBuffer, VkPipelineStageFlags2KHR stage, VkQueryPool queryPool, deUint32 query);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* QueueSubmit2KHRFunc)                                                                                                       (VkQueue queue, deUint32 submitCount, const VkSubmitInfo2KHR* pSubmits, VkFence fence);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdWriteBufferMarker2AMDFunc)                                                                                      (VkCommandBuffer commandBuffer, VkPipelineStageFlags2KHR stage, VkBuffer dstBuffer, VkDeviceSize dstOffset, deUint32 marker);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetQueueCheckpointData2NVFunc)                                                                                     (VkQueue queue, deUint32* pCheckpointDataCount, VkCheckpointData2NV* pCheckpointData);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdWriteTimestamp2KHRFunc)                                                                                         (VkCommandBuffer commandBuffer, VkPipelineStageFlags2KHR stage, VkQueryPool queryPool, uint32_t query);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* QueueSubmit2KHRFunc)                                                                                                       (VkQueue queue, uint32_t submitCount, const VkSubmitInfo2KHR* pSubmits, VkFence fence);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdWriteBufferMarker2AMDFunc)                                                                                      (VkCommandBuffer commandBuffer, VkPipelineStageFlags2KHR stage, VkBuffer dstBuffer, VkDeviceSize dstOffset, uint32_t marker);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetQueueCheckpointData2NVFunc)                                                                                     (VkQueue queue, uint32_t* pCheckpointDataCount, VkCheckpointData2NV* pCheckpointData);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdCopyBuffer2KHRFunc)                                                                                                     (VkCommandBuffer commandBuffer, const VkCopyBufferInfo2KHR* pCopyBufferInfo);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdCopyImage2KHRFunc)                                                                                                      (VkCommandBuffer commandBuffer, const VkCopyImageInfo2KHR* pCopyImageInfo);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdCopyBufferToImage2KHRFunc)                                                                                      (VkCommandBuffer commandBuffer, const VkCopyBufferToImageInfo2KHR* pCopyBufferToImageInfo);
@@ -284,18 +284,18 @@ typedef VKAPI_ATTR void                                   (VKAPI_CALL* CmdBlitImage2KHRFunc)                                                                                                      (VkCo
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdResolveImage2KHRFunc)                                                                                           (VkCommandBuffer commandBuffer, const VkResolveImageInfo2KHR* pResolveImageInfo);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CreateDebugReportCallbackEXTFunc)                                                                          (VkInstance instance, const VkDebugReportCallbackCreateInfoEXT* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkDebugReportCallbackEXT* pCallback);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* DestroyDebugReportCallbackEXTFunc)                                                                         (VkInstance instance, VkDebugReportCallbackEXT callback, const VkAllocationCallbacks* pAllocator);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* DebugReportMessageEXTFunc)                                                                                         (VkInstance instance, VkDebugReportFlagsEXT flags, VkDebugReportObjectTypeEXT objectType, deUint64 object, deUintptr location, deInt32 messageCode, const char* pLayerPrefix, const char* pMessage);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* DebugReportMessageEXTFunc)                                                                                         (VkInstance instance, VkDebugReportFlagsEXT flags, VkDebugReportObjectTypeEXT objectType, deUint64 object, deUintptr location, int32_t messageCode, const char* pLayerPrefix, const char* pMessage);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* DebugMarkerSetObjectTagEXTFunc)                                                                            (VkDevice device, const VkDebugMarkerObjectTagInfoEXT* pTagInfo);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* DebugMarkerSetObjectNameEXTFunc)                                                                           (VkDevice device, const VkDebugMarkerObjectNameInfoEXT* pNameInfo);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdDebugMarkerBeginEXTFunc)                                                                                        (VkCommandBuffer commandBuffer, const VkDebugMarkerMarkerInfoEXT* pMarkerInfo);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdDebugMarkerEndEXTFunc)                                                                                          (VkCommandBuffer commandBuffer);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdDebugMarkerInsertEXTFunc)                                                                                       (VkCommandBuffer commandBuffer, const VkDebugMarkerMarkerInfoEXT* pMarkerInfo);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdBindTransformFeedbackBuffersEXTFunc)                                                            (VkCommandBuffer commandBuffer, deUint32 firstBinding, deUint32 bindingCount, const VkBuffer* pBuffers, const VkDeviceSize* pOffsets, const VkDeviceSize* pSizes);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdBeginTransformFeedbackEXTFunc)                                                                          (VkCommandBuffer commandBuffer, deUint32 firstCounterBuffer, deUint32 counterBufferCount, const VkBuffer* pCounterBuffers, const VkDeviceSize* pCounterBufferOffsets);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdEndTransformFeedbackEXTFunc)                                                                            (VkCommandBuffer commandBuffer, deUint32 firstCounterBuffer, deUint32 counterBufferCount, const VkBuffer* pCounterBuffers, const VkDeviceSize* pCounterBufferOffsets);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdBeginQueryIndexedEXTFunc)                                                                                       (VkCommandBuffer commandBuffer, VkQueryPool queryPool, deUint32 query, VkQueryControlFlags flags, deUint32 index);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdEndQueryIndexedEXTFunc)                                                                                         (VkCommandBuffer commandBuffer, VkQueryPool queryPool, deUint32 query, deUint32 index);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdDrawIndirectByteCountEXTFunc)                                                                           (VkCommandBuffer commandBuffer, deUint32 instanceCount, deUint32 firstInstance, VkBuffer counterBuffer, VkDeviceSize counterBufferOffset, deUint32 counterOffset, deUint32 vertexStride);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdBindTransformFeedbackBuffersEXTFunc)                                                            (VkCommandBuffer commandBuffer, uint32_t firstBinding, uint32_t bindingCount, const VkBuffer* pBuffers, const VkDeviceSize* pOffsets, const VkDeviceSize* pSizes);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdBeginTransformFeedbackEXTFunc)                                                                          (VkCommandBuffer commandBuffer, uint32_t firstCounterBuffer, uint32_t counterBufferCount, const VkBuffer* pCounterBuffers, const VkDeviceSize* pCounterBufferOffsets);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdEndTransformFeedbackEXTFunc)                                                                            (VkCommandBuffer commandBuffer, uint32_t firstCounterBuffer, uint32_t counterBufferCount, const VkBuffer* pCounterBuffers, const VkDeviceSize* pCounterBufferOffsets);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdBeginQueryIndexedEXTFunc)                                                                                       (VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query, VkQueryControlFlags flags, uint32_t index);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdEndQueryIndexedEXTFunc)                                                                                         (VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query, uint32_t index);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdDrawIndirectByteCountEXTFunc)                                                                           (VkCommandBuffer commandBuffer, uint32_t instanceCount, uint32_t firstInstance, VkBuffer counterBuffer, VkDeviceSize counterBufferOffset, uint32_t counterOffset, uint32_t vertexStride);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CreateCuModuleNVXFunc)                                                                                                     (VkDevice device, const VkCuModuleCreateInfoNVX* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkCuModuleNVX* pModule);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CreateCuFunctionNVXFunc)                                                                                           (VkDevice device, const VkCuFunctionCreateInfoNVX* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkCuFunctionNVX* pFunction);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* DestroyCuModuleNVXFunc)                                                                                            (VkDevice device, VkCuModuleNVX module, const VkAllocationCallbacks* pAllocator);
@@ -303,13 +303,13 @@ typedef VKAPI_ATTR void                                   (VKAPI_CALL* DestroyCuFunctionNVXFunc)                                                                                          (V
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdCuLaunchKernelNVXFunc)                                                                                          (VkCommandBuffer commandBuffer, const VkCuLaunchInfoNVX* pLaunchInfo);
 typedef VKAPI_ATTR uint32_t                            (VKAPI_CALL* GetImageViewHandleNVXFunc)                                                                                         (VkDevice device, const VkImageViewHandleInfoNVX* pInfo);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetImageViewAddressNVXFunc)                                                                                        (VkDevice device, VkImageView imageView, VkImageViewAddressPropertiesNVX* pProperties);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdDrawIndirectCountAMDFunc)                                                                                       (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, deUint32 maxDrawCount, deUint32 stride);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdDrawIndexedIndirectCountAMDFunc)                                                                        (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, deUint32 maxDrawCount, deUint32 stride);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdDrawIndirectCountAMDFunc)                                                                                       (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdDrawIndexedIndirectCountAMDFunc)                                                                        (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetShaderInfoAMDFunc)                                                                                                      (VkDevice device, VkPipeline pipeline, VkShaderStageFlagBits shaderStage, VkShaderInfoTypeAMD infoType, deUintptr* pInfoSize, void* pInfo);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPhysicalDeviceExternalImageFormatPropertiesNVFunc)                                      (VkPhysicalDevice physicalDevice, VkFormat format, VkImageType type, VkImageTiling tiling, VkImageUsageFlags usage, VkImageCreateFlags flags, VkExternalMemoryHandleTypeFlagsNV externalHandleType, VkExternalImageFormatPropertiesNV* pExternalImageFormatProperties);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdBeginConditionalRenderingEXTFunc)                                                                       (VkCommandBuffer commandBuffer, const VkConditionalRenderingBeginInfoEXT* pConditionalRenderingBegin);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdEndConditionalRenderingEXTFunc)                                                                         (VkCommandBuffer commandBuffer);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetViewportWScalingNVFunc)                                                                                      (VkCommandBuffer commandBuffer, deUint32 firstViewport, deUint32 viewportCount, const VkViewportWScalingNV* pViewportWScalings);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetViewportWScalingNVFunc)                                                                                      (VkCommandBuffer commandBuffer, uint32_t firstViewport, uint32_t viewportCount, const VkViewportWScalingNV* pViewportWScalings);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* ReleaseDisplayEXTFunc)                                                                                                     (VkPhysicalDevice physicalDevice, VkDisplayKHR display);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPhysicalDeviceSurfaceCapabilities2EXTFunc)                                                      (VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, VkSurfaceCapabilities2EXT* pSurfaceCapabilities);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* DisplayPowerControlEXTFunc)                                                                                        (VkDevice device, VkDisplayKHR display, const VkDisplayPowerInfoEXT* pDisplayPowerInfo);
@@ -317,9 +317,9 @@ typedef VKAPI_ATTR VkResult                         (VKAPI_CALL* RegisterDeviceEventEXTFunc)
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* RegisterDisplayEventEXTFunc)                                                                                       (VkDevice device, VkDisplayKHR display, const VkDisplayEventInfoEXT* pDisplayEventInfo, const VkAllocationCallbacks* pAllocator, VkFence* pFence);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetSwapchainCounterEXTFunc)                                                                                        (VkDevice device, VkSwapchainKHR swapchain, VkSurfaceCounterFlagBitsEXT counter, deUint64* pCounterValue);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetRefreshCycleDurationGOOGLEFunc)                                                                         (VkDevice device, VkSwapchainKHR swapchain, VkRefreshCycleDurationGOOGLE* pDisplayTimingProperties);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPastPresentationTimingGOOGLEFunc)                                                                       (VkDevice device, VkSwapchainKHR swapchain, deUint32* pPresentationTimingCount, VkPastPresentationTimingGOOGLE* pPresentationTimings);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetDiscardRectangleEXTFunc)                                                                                     (VkCommandBuffer commandBuffer, deUint32 firstDiscardRectangle, deUint32 discardRectangleCount, const VkRect2D* pDiscardRectangles);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* SetHdrMetadataEXTFunc)                                                                                                     (VkDevice device, deUint32 swapchainCount, const VkSwapchainKHR* pSwapchains, const VkHdrMetadataEXT* pMetadata);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPastPresentationTimingGOOGLEFunc)                                                                       (VkDevice device, VkSwapchainKHR swapchain, uint32_t* pPresentationTimingCount, VkPastPresentationTimingGOOGLE* pPresentationTimings);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetDiscardRectangleEXTFunc)                                                                                     (VkCommandBuffer commandBuffer, uint32_t firstDiscardRectangle, uint32_t discardRectangleCount, const VkRect2D* pDiscardRectangles);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* SetHdrMetadataEXTFunc)                                                                                                     (VkDevice device, uint32_t swapchainCount, const VkSwapchainKHR* pSwapchains, const VkHdrMetadataEXT* pMetadata);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* SetDebugUtilsObjectNameEXTFunc)                                                                            (VkDevice device, const VkDebugUtilsObjectNameInfoEXT* pNameInfo);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* SetDebugUtilsObjectTagEXTFunc)                                                                                     (VkDevice device, const VkDebugUtilsObjectTagInfoEXT* pTagInfo);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* QueueBeginDebugUtilsLabelEXTFunc)                                                                          (VkQueue queue, const VkDebugUtilsLabelEXT* pLabelInfo);
@@ -336,34 +336,34 @@ typedef VKAPI_ATTR void                                   (VKAPI_CALL* GetPhysicalDeviceMultisamplePropertiesE
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetImageDrmFormatModifierPropertiesEXTFunc)                                                        (VkDevice device, VkImage image, VkImageDrmFormatModifierPropertiesEXT* pProperties);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CreateValidationCacheEXTFunc)                                                                                      (VkDevice device, const VkValidationCacheCreateInfoEXT* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkValidationCacheEXT* pValidationCache);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* DestroyValidationCacheEXTFunc)                                                                                     (VkDevice device, VkValidationCacheEXT validationCache, const VkAllocationCallbacks* pAllocator);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* MergeValidationCachesEXTFunc)                                                                                      (VkDevice device, VkValidationCacheEXT dstCache, deUint32 srcCacheCount, const VkValidationCacheEXT* pSrcCaches);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* MergeValidationCachesEXTFunc)                                                                                      (VkDevice device, VkValidationCacheEXT dstCache, uint32_t srcCacheCount, const VkValidationCacheEXT* pSrcCaches);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetValidationCacheDataEXTFunc)                                                                                     (VkDevice device, VkValidationCacheEXT validationCache, deUintptr* pDataSize, void* pData);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdBindShadingRateImageNVFunc)                                                                                     (VkCommandBuffer commandBuffer, VkImageView imageView, VkImageLayout imageLayout);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetViewportShadingRatePaletteNVFunc)                                                            (VkCommandBuffer commandBuffer, deUint32 firstViewport, deUint32 viewportCount, const VkShadingRatePaletteNV* pShadingRatePalettes);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetCoarseSampleOrderNVFunc)                                                                                     (VkCommandBuffer commandBuffer, VkCoarseSampleOrderTypeNV sampleOrderType, deUint32 customSampleOrderCount, const VkCoarseSampleOrderCustomNV* pCustomSampleOrders);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetViewportShadingRatePaletteNVFunc)                                                            (VkCommandBuffer commandBuffer, uint32_t firstViewport, uint32_t viewportCount, const VkShadingRatePaletteNV* pShadingRatePalettes);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetCoarseSampleOrderNVFunc)                                                                                     (VkCommandBuffer commandBuffer, VkCoarseSampleOrderTypeNV sampleOrderType, uint32_t customSampleOrderCount, const VkCoarseSampleOrderCustomNV* pCustomSampleOrders);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CreateAccelerationStructureNVFunc)                                                                         (VkDevice device, const VkAccelerationStructureCreateInfoNV* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkAccelerationStructureNV* pAccelerationStructure);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* DestroyAccelerationStructureNVFunc)                                                                        (VkDevice device, VkAccelerationStructureNV accelerationStructure, const VkAllocationCallbacks* pAllocator);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetAccelerationStructureMemoryRequirementsNVFunc)                                          (VkDevice device, const VkAccelerationStructureMemoryRequirementsInfoNV* pInfo, VkMemoryRequirements2KHR* pMemoryRequirements);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* BindAccelerationStructureMemoryNVFunc)                                                                     (VkDevice device, deUint32 bindInfoCount, const VkBindAccelerationStructureMemoryInfoNV* pBindInfos);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* BindAccelerationStructureMemoryNVFunc)                                                                     (VkDevice device, uint32_t bindInfoCount, const VkBindAccelerationStructureMemoryInfoNV* pBindInfos);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdBuildAccelerationStructureNVFunc)                                                                       (VkCommandBuffer commandBuffer, const VkAccelerationStructureInfoNV* pInfo, VkBuffer instanceData, VkDeviceSize instanceOffset, VkBool32 update, VkAccelerationStructureNV dst, VkAccelerationStructureNV src, VkBuffer scratch, VkDeviceSize scratchOffset);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdCopyAccelerationStructureNVFunc)                                                                        (VkCommandBuffer commandBuffer, VkAccelerationStructureNV dst, VkAccelerationStructureNV src, VkCopyAccelerationStructureModeKHR mode);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdTraceRaysNVFunc)                                                                                                        (VkCommandBuffer commandBuffer, VkBuffer raygenShaderBindingTableBuffer, VkDeviceSize raygenShaderBindingOffset, VkBuffer missShaderBindingTableBuffer, VkDeviceSize missShaderBindingOffset, VkDeviceSize missShaderBindingStride, VkBuffer hitShaderBindingTableBuffer, VkDeviceSize hitShaderBindingOffset, VkDeviceSize hitShaderBindingStride, VkBuffer callableShaderBindingTableBuffer, VkDeviceSize callableShaderBindingOffset, VkDeviceSize callableShaderBindingStride, deUint32 width, deUint32 height, deUint32 depth);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CreateRayTracingPipelinesNVFunc)                                                                           (VkDevice device, VkPipelineCache pipelineCache, deUint32 createInfoCount, const VkRayTracingPipelineCreateInfoNV* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkPipeline* pPipelines);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetRayTracingShaderGroupHandlesKHRFunc)                                                            (VkDevice device, VkPipeline pipeline, deUint32 firstGroup, deUint32 groupCount, deUintptr dataSize, void* pData);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetRayTracingShaderGroupHandlesNVFunc)                                                                     (VkDevice device, VkPipeline pipeline, deUint32 firstGroup, deUint32 groupCount, deUintptr dataSize, void* pData);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdTraceRaysNVFunc)                                                                                                        (VkCommandBuffer commandBuffer, VkBuffer raygenShaderBindingTableBuffer, VkDeviceSize raygenShaderBindingOffset, VkBuffer missShaderBindingTableBuffer, VkDeviceSize missShaderBindingOffset, VkDeviceSize missShaderBindingStride, VkBuffer hitShaderBindingTableBuffer, VkDeviceSize hitShaderBindingOffset, VkDeviceSize hitShaderBindingStride, VkBuffer callableShaderBindingTableBuffer, VkDeviceSize callableShaderBindingOffset, VkDeviceSize callableShaderBindingStride, uint32_t width, uint32_t height, uint32_t depth);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CreateRayTracingPipelinesNVFunc)                                                                           (VkDevice device, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkRayTracingPipelineCreateInfoNV* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkPipeline* pPipelines);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetRayTracingShaderGroupHandlesKHRFunc)                                                            (VkDevice device, VkPipeline pipeline, uint32_t firstGroup, uint32_t groupCount, deUintptr dataSize, void* pData);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetRayTracingShaderGroupHandlesNVFunc)                                                                     (VkDevice device, VkPipeline pipeline, uint32_t firstGroup, uint32_t groupCount, deUintptr dataSize, void* pData);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetAccelerationStructureHandleNVFunc)                                                                      (VkDevice device, VkAccelerationStructureNV accelerationStructure, deUintptr dataSize, void* pData);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdWriteAccelerationStructuresPropertiesNVFunc)                                            (VkCommandBuffer commandBuffer, deUint32 accelerationStructureCount, const VkAccelerationStructureNV* pAccelerationStructures, VkQueryType queryType, VkQueryPool queryPool, deUint32 firstQuery);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CompileDeferredNVFunc)                                                                                                     (VkDevice device, VkPipeline pipeline, deUint32 shader);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdWriteAccelerationStructuresPropertiesNVFunc)                                            (VkCommandBuffer commandBuffer, uint32_t accelerationStructureCount, const VkAccelerationStructureNV* pAccelerationStructures, VkQueryType queryType, VkQueryPool queryPool, uint32_t firstQuery);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CompileDeferredNVFunc)                                                                                                     (VkDevice device, VkPipeline pipeline, uint32_t shader);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetMemoryHostPointerPropertiesEXTFunc)                                                                     (VkDevice device, VkExternalMemoryHandleTypeFlagBits handleType, const void* pHostPointer, VkMemoryHostPointerPropertiesEXT* pMemoryHostPointerProperties);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdWriteBufferMarkerAMDFunc)                                                                                       (VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkBuffer dstBuffer, VkDeviceSize dstOffset, deUint32 marker);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPhysicalDeviceCalibrateableTimeDomainsEXTFunc)                                          (VkPhysicalDevice physicalDevice, deUint32* pTimeDomainCount, VkTimeDomainEXT* pTimeDomains);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetCalibratedTimestampsEXTFunc)                                                                            (VkDevice device, deUint32 timestampCount, const VkCalibratedTimestampInfoEXT* pTimestampInfos, deUint64* pTimestamps, deUint64* pMaxDeviation);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdDrawMeshTasksNVFunc)                                                                                            (VkCommandBuffer commandBuffer, deUint32 taskCount, deUint32 firstTask);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdDrawMeshTasksIndirectNVFunc)                                                                            (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, deUint32 drawCount, deUint32 stride);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdDrawMeshTasksIndirectCountNVFunc)                                                                       (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, deUint32 maxDrawCount, deUint32 stride);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetExclusiveScissorNVFunc)                                                                                      (VkCommandBuffer commandBuffer, deUint32 firstExclusiveScissor, deUint32 exclusiveScissorCount, const VkRect2D* pExclusiveScissors);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdWriteBufferMarkerAMDFunc)                                                                                       (VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkBuffer dstBuffer, VkDeviceSize dstOffset, uint32_t marker);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPhysicalDeviceCalibrateableTimeDomainsEXTFunc)                                          (VkPhysicalDevice physicalDevice, uint32_t* pTimeDomainCount, VkTimeDomainEXT* pTimeDomains);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetCalibratedTimestampsEXTFunc)                                                                            (VkDevice device, uint32_t timestampCount, const VkCalibratedTimestampInfoEXT* pTimestampInfos, deUint64* pTimestamps, deUint64* pMaxDeviation);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdDrawMeshTasksNVFunc)                                                                                            (VkCommandBuffer commandBuffer, uint32_t taskCount, uint32_t firstTask);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdDrawMeshTasksIndirectNVFunc)                                                                            (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdDrawMeshTasksIndirectCountNVFunc)                                                                       (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetExclusiveScissorNVFunc)                                                                                      (VkCommandBuffer commandBuffer, uint32_t firstExclusiveScissor, uint32_t exclusiveScissorCount, const VkRect2D* pExclusiveScissors);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetCheckpointNVFunc)                                                                                            (VkCommandBuffer commandBuffer, const void* pCheckpointMarker);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetQueueCheckpointDataNVFunc)                                                                                      (VkQueue queue, deUint32* pCheckpointDataCount, VkCheckpointDataNV* pCheckpointData);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetQueueCheckpointDataNVFunc)                                                                                      (VkQueue queue, uint32_t* pCheckpointDataCount, VkCheckpointDataNV* pCheckpointData);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* InitializePerformanceApiINTELFunc)                                                                         (VkDevice device, const VkInitializePerformanceApiInfoINTEL* pInitializeInfo);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* UninitializePerformanceApiINTELFunc)                                                                       (VkDevice device);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CmdSetPerformanceMarkerINTELFunc)                                                                          (VkCommandBuffer commandBuffer, const VkPerformanceMarkerInfoINTEL* pMarkerInfo);
@@ -375,18 +375,18 @@ typedef VKAPI_ATTR VkResult                               (VKAPI_CALL* QueueSetPerformanceConfigurationINTE
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPerformanceParameterINTELFunc)                                                                          (VkDevice device, VkPerformanceParameterTypeINTEL parameter, VkPerformanceValueINTEL* pValue);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* SetLocalDimmingAMDFunc)                                                                                            (VkDevice device, VkSwapchainKHR swapChain, VkBool32 localDimmingEnable);
 typedef VKAPI_ATTR VkDeviceAddress             (VKAPI_CALL* GetBufferDeviceAddressEXTFunc)                                                                                     (VkDevice device, const VkBufferDeviceAddressInfo* pInfo);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPhysicalDeviceToolPropertiesEXTFunc)                                                            (VkPhysicalDevice physicalDevice, deUint32* pToolCount, VkPhysicalDeviceToolPropertiesEXT* pToolProperties);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPhysicalDeviceCooperativeMatrixPropertiesNVFunc)                                        (VkPhysicalDevice physicalDevice, deUint32* pPropertyCount, VkCooperativeMatrixPropertiesNV* pProperties);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNVFunc)       (VkPhysicalDevice physicalDevice, deUint32* pCombinationCount, VkFramebufferMixedSamplesCombinationNV* pCombinations);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPhysicalDeviceToolPropertiesEXTFunc)                                                            (VkPhysicalDevice physicalDevice, uint32_t* pToolCount, VkPhysicalDeviceToolPropertiesEXT* pToolProperties);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPhysicalDeviceCooperativeMatrixPropertiesNVFunc)                                        (VkPhysicalDevice physicalDevice, uint32_t* pPropertyCount, VkCooperativeMatrixPropertiesNV* pProperties);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNVFunc)       (VkPhysicalDevice physicalDevice, uint32_t* pCombinationCount, VkFramebufferMixedSamplesCombinationNV* pCombinations);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CreateHeadlessSurfaceEXTFunc)                                                                                      (VkInstance instance, const VkHeadlessSurfaceCreateInfoEXT* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetLineStippleEXTFunc)                                                                                          (VkCommandBuffer commandBuffer, deUint32 lineStippleFactor, deUint16 lineStipplePattern);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* ResetQueryPoolEXTFunc)                                                                                                     (VkDevice device, VkQueryPool queryPool, deUint32 firstQuery, deUint32 queryCount);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetLineStippleEXTFunc)                                                                                          (VkCommandBuffer commandBuffer, uint32_t lineStippleFactor, deUint16 lineStipplePattern);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* ResetQueryPoolEXTFunc)                                                                                                     (VkDevice device, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetCullModeEXTFunc)                                                                                                     (VkCommandBuffer commandBuffer, VkCullModeFlags cullMode);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetFrontFaceEXTFunc)                                                                                            (VkCommandBuffer commandBuffer, VkFrontFace frontFace);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetPrimitiveTopologyEXTFunc)                                                                            (VkCommandBuffer commandBuffer, VkPrimitiveTopology primitiveTopology);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetViewportWithCountEXTFunc)                                                                            (VkCommandBuffer commandBuffer, deUint32 viewportCount, const VkViewport* pViewports);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetScissorWithCountEXTFunc)                                                                                     (VkCommandBuffer commandBuffer, deUint32 scissorCount, const VkRect2D* pScissors);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdBindVertexBuffers2EXTFunc)                                                                                      (VkCommandBuffer commandBuffer, deUint32 firstBinding, deUint32 bindingCount, const VkBuffer* pBuffers, const VkDeviceSize* pOffsets, const VkDeviceSize* pSizes, const VkDeviceSize* pStrides);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetViewportWithCountEXTFunc)                                                                            (VkCommandBuffer commandBuffer, uint32_t viewportCount, const VkViewport* pViewports);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetScissorWithCountEXTFunc)                                                                                     (VkCommandBuffer commandBuffer, uint32_t scissorCount, const VkRect2D* pScissors);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdBindVertexBuffers2EXTFunc)                                                                                      (VkCommandBuffer commandBuffer, uint32_t firstBinding, uint32_t bindingCount, const VkBuffer* pBuffers, const VkDeviceSize* pOffsets, const VkDeviceSize* pSizes, const VkDeviceSize* pStrides);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetDepthTestEnableEXTFunc)                                                                                      (VkCommandBuffer commandBuffer, VkBool32 depthTestEnable);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetDepthWriteEnableEXTFunc)                                                                                     (VkCommandBuffer commandBuffer, VkBool32 depthWriteEnable);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetDepthCompareOpEXTFunc)                                                                                       (VkCommandBuffer commandBuffer, VkCompareOp depthCompareOp);
@@ -396,61 +396,61 @@ typedef VKAPI_ATTR void                                   (VKAPI_CALL* CmdSetStencilOpEXTFunc)                                                                                            (VkC
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetGeneratedCommandsMemoryRequirementsNVFunc)                                                      (VkDevice device, const VkGeneratedCommandsMemoryRequirementsInfoNV* pInfo, VkMemoryRequirements2* pMemoryRequirements);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdPreprocessGeneratedCommandsNVFunc)                                                                      (VkCommandBuffer commandBuffer, const VkGeneratedCommandsInfoNV* pGeneratedCommandsInfo);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdExecuteGeneratedCommandsNVFunc)                                                                         (VkCommandBuffer commandBuffer, VkBool32 isPreprocessed, const VkGeneratedCommandsInfoNV* pGeneratedCommandsInfo);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdBindPipelineShaderGroupNVFunc)                                                                          (VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline pipeline, deUint32 groupIndex);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdBindPipelineShaderGroupNVFunc)                                                                          (VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline pipeline, uint32_t groupIndex);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CreateIndirectCommandsLayoutNVFunc)                                                                        (VkDevice device, const VkIndirectCommandsLayoutCreateInfoNV* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkIndirectCommandsLayoutNV* pIndirectCommandsLayout);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* DestroyIndirectCommandsLayoutNVFunc)                                                                       (VkDevice device, VkIndirectCommandsLayoutNV indirectCommandsLayout, const VkAllocationCallbacks* pAllocator);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* AcquireDrmDisplayEXTFunc)                                                                                          (VkPhysicalDevice physicalDevice, deInt32 drmFd, VkDisplayKHR display);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetDrmDisplayEXTFunc)                                                                                                      (VkPhysicalDevice physicalDevice, deInt32 drmFd, deUint32 connectorId, VkDisplayKHR* display);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* AcquireDrmDisplayEXTFunc)                                                                                          (VkPhysicalDevice physicalDevice, int32_t drmFd, VkDisplayKHR display);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetDrmDisplayEXTFunc)                                                                                                      (VkPhysicalDevice physicalDevice, int32_t drmFd, uint32_t connectorId, VkDisplayKHR* display);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CreatePrivateDataSlotEXTFunc)                                                                                      (VkDevice device, const VkPrivateDataSlotCreateInfoEXT* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkPrivateDataSlotEXT* pPrivateDataSlot);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* DestroyPrivateDataSlotEXTFunc)                                                                                     (VkDevice device, VkPrivateDataSlotEXT privateDataSlot, const VkAllocationCallbacks* pAllocator);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* SetPrivateDataEXTFunc)                                                                                                     (VkDevice device, VkObjectType objectType, deUint64 objectHandle, VkPrivateDataSlotEXT privateDataSlot, deUint64 data);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetPrivateDataEXTFunc)                                                                                                     (VkDevice device, VkObjectType objectType, deUint64 objectHandle, VkPrivateDataSlotEXT privateDataSlot, deUint64* pData);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetFragmentShadingRateEnumNVFunc)                                                                       (VkCommandBuffer commandBuffer, VkFragmentShadingRateNV shadingRate, const VkFragmentShadingRateCombinerOpKHR combinerOps[2]);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* AcquireWinrtDisplayNVFunc)                                                                                         (VkPhysicalDevice physicalDevice, VkDisplayKHR display);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetWinrtDisplayNVFunc)                                                                                                     (VkPhysicalDevice physicalDevice, deUint32 deviceRelativeId, VkDisplayKHR* pDisplay);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetVertexInputEXTFunc)                                                                                          (VkCommandBuffer commandBuffer, deUint32 vertexBindingDescriptionCount, const VkVertexInputBindingDescription2EXT* pVertexBindingDescriptions, deUint32 vertexAttributeDescriptionCount, const VkVertexInputAttributeDescription2EXT* pVertexAttributeDescriptions);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetWinrtDisplayNVFunc)                                                                                                     (VkPhysicalDevice physicalDevice, uint32_t deviceRelativeId, VkDisplayKHR* pDisplay);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetVertexInputEXTFunc)                                                                                          (VkCommandBuffer commandBuffer, uint32_t vertexBindingDescriptionCount, const VkVertexInputBindingDescription2EXT* pVertexBindingDescriptions, uint32_t vertexAttributeDescriptionCount, const VkVertexInputAttributeDescription2EXT* pVertexAttributeDescriptions);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetDeviceSubpassShadingMaxWorkgroupSizeHUAWEIFunc)                                         (VkDevice device, VkRenderPass renderpass, VkExtent2D* pMaxWorkgroupSize);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSubpassShadingHUAWEIFunc)                                                                                       (VkCommandBuffer commandBuffer);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetMemoryRemoteAddressNVFunc)                                                                                      (VkDevice device, const VkMemoryGetRemoteAddressInfoNV* getMemoryRemoteAddressInfo, VkRemoteAddressNV* pAddress);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetPatchControlPointsEXTFunc)                                                                           (VkCommandBuffer commandBuffer, deUint32 patchControlPoints);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetPatchControlPointsEXTFunc)                                                                           (VkCommandBuffer commandBuffer, uint32_t patchControlPoints);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetRasterizerDiscardEnableEXTFunc)                                                                      (VkCommandBuffer commandBuffer, VkBool32 rasterizerDiscardEnable);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetDepthBiasEnableEXTFunc)                                                                                      (VkCommandBuffer commandBuffer, VkBool32 depthBiasEnable);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetLogicOpEXTFunc)                                                                                                      (VkCommandBuffer commandBuffer, VkLogicOp logicOp);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetPrimitiveRestartEnableEXTFunc)                                                                       (VkCommandBuffer commandBuffer, VkBool32 primitiveRestartEnable);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetColorWriteEnableEXTFunc)                                                                                     (VkCommandBuffer commandBuffer, deUint32 attachmentCount, const VkBool32* pColorWriteEnables);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdDrawMultiEXTFunc)                                                                                                       (VkCommandBuffer commandBuffer, deUint32 drawCount, const VkMultiDrawInfoEXT* pVertexInfo, deUint32 instanceCount, deUint32 firstInstance, deUint32 stride);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdDrawMultiIndexedEXTFunc)                                                                                        (VkCommandBuffer commandBuffer, deUint32 drawCount, const VkMultiDrawIndexedInfoEXT* pIndexInfo, deUint32 instanceCount, deUint32 firstInstance, deUint32 stride, const deInt32* pVertexOffset);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetColorWriteEnableEXTFunc)                                                                                     (VkCommandBuffer commandBuffer, uint32_t attachmentCount, const VkBool32* pColorWriteEnables);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdDrawMultiEXTFunc)                                                                                                       (VkCommandBuffer commandBuffer, uint32_t drawCount, const VkMultiDrawInfoEXT* pVertexInfo, uint32_t instanceCount, uint32_t firstInstance, uint32_t stride);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdDrawMultiIndexedEXTFunc)                                                                                        (VkCommandBuffer commandBuffer, uint32_t drawCount, const VkMultiDrawIndexedInfoEXT* pIndexInfo, uint32_t instanceCount, uint32_t firstInstance, uint32_t stride, const int32_t* pVertexOffset);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CreateAccelerationStructureKHRFunc)                                                                        (VkDevice device, const VkAccelerationStructureCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkAccelerationStructureKHR* pAccelerationStructure);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* DestroyAccelerationStructureKHRFunc)                                                                       (VkDevice device, VkAccelerationStructureKHR accelerationStructure, const VkAllocationCallbacks* pAllocator);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdBuildAccelerationStructuresKHRFunc)                                                                     (VkCommandBuffer commandBuffer, deUint32 infoCount, const VkAccelerationStructureBuildGeometryInfoKHR* pInfos, const VkAccelerationStructureBuildRangeInfoKHR* const* ppBuildRangeInfos);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdBuildAccelerationStructuresIndirectKHRFunc)                                                     (VkCommandBuffer commandBuffer, deUint32 infoCount, const VkAccelerationStructureBuildGeometryInfoKHR* pInfos, const VkDeviceAddress* pIndirectDeviceAddresses, const deUint32* pIndirectStrides, const deUint32* const* ppMaxPrimitiveCounts);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* BuildAccelerationStructuresKHRFunc)                                                                        (VkDevice device, VkDeferredOperationKHR deferredOperation, deUint32 infoCount, const VkAccelerationStructureBuildGeometryInfoKHR* pInfos, const VkAccelerationStructureBuildRangeInfoKHR* const* ppBuildRangeInfos);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdBuildAccelerationStructuresKHRFunc)                                                                     (VkCommandBuffer commandBuffer, uint32_t infoCount, const VkAccelerationStructureBuildGeometryInfoKHR* pInfos, const VkAccelerationStructureBuildRangeInfoKHR* const* ppBuildRangeInfos);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdBuildAccelerationStructuresIndirectKHRFunc)                                                     (VkCommandBuffer commandBuffer, uint32_t infoCount, const VkAccelerationStructureBuildGeometryInfoKHR* pInfos, const VkDeviceAddress* pIndirectDeviceAddresses, const uint32_t* pIndirectStrides, const uint32_t* const* ppMaxPrimitiveCounts);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* BuildAccelerationStructuresKHRFunc)                                                                        (VkDevice device, VkDeferredOperationKHR deferredOperation, uint32_t infoCount, const VkAccelerationStructureBuildGeometryInfoKHR* pInfos, const VkAccelerationStructureBuildRangeInfoKHR* const* ppBuildRangeInfos);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CopyAccelerationStructureKHRFunc)                                                                          (VkDevice device, VkDeferredOperationKHR deferredOperation, const VkCopyAccelerationStructureInfoKHR* pInfo);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CopyAccelerationStructureToMemoryKHRFunc)                                                          (VkDevice device, VkDeferredOperationKHR deferredOperation, const VkCopyAccelerationStructureToMemoryInfoKHR* pInfo);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CopyMemoryToAccelerationStructureKHRFunc)                                                          (VkDevice device, VkDeferredOperationKHR deferredOperation, const VkCopyMemoryToAccelerationStructureInfoKHR* pInfo);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* WriteAccelerationStructuresPropertiesKHRFunc)                                                      (VkDevice device, deUint32 accelerationStructureCount, const VkAccelerationStructureKHR* pAccelerationStructures, VkQueryType queryType, deUintptr dataSize, void* pData, deUintptr stride);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* WriteAccelerationStructuresPropertiesKHRFunc)                                                      (VkDevice device, uint32_t accelerationStructureCount, const VkAccelerationStructureKHR* pAccelerationStructures, VkQueryType queryType, deUintptr dataSize, void* pData, deUintptr stride);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdCopyAccelerationStructureKHRFunc)                                                                       (VkCommandBuffer commandBuffer, const VkCopyAccelerationStructureInfoKHR* pInfo);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdCopyAccelerationStructureToMemoryKHRFunc)                                                       (VkCommandBuffer commandBuffer, const VkCopyAccelerationStructureToMemoryInfoKHR* pInfo);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdCopyMemoryToAccelerationStructureKHRFunc)                                                       (VkCommandBuffer commandBuffer, const VkCopyMemoryToAccelerationStructureInfoKHR* pInfo);
 typedef VKAPI_ATTR VkDeviceAddress             (VKAPI_CALL* GetAccelerationStructureDeviceAddressKHRFunc)                                                      (VkDevice device, const VkAccelerationStructureDeviceAddressInfoKHR* pInfo);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdWriteAccelerationStructuresPropertiesKHRFunc)                                           (VkCommandBuffer commandBuffer, deUint32 accelerationStructureCount, const VkAccelerationStructureKHR* pAccelerationStructures, VkQueryType queryType, VkQueryPool queryPool, deUint32 firstQuery);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdWriteAccelerationStructuresPropertiesKHRFunc)                                           (VkCommandBuffer commandBuffer, uint32_t accelerationStructureCount, const VkAccelerationStructureKHR* pAccelerationStructures, VkQueryType queryType, VkQueryPool queryPool, uint32_t firstQuery);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetDeviceAccelerationStructureCompatibilityKHRFunc)                                        (VkDevice device, const VkAccelerationStructureVersionInfoKHR* pVersionInfo, VkAccelerationStructureCompatibilityKHR* pCompatibility);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetAccelerationStructureBuildSizesKHRFunc)                                                         (VkDevice device, VkAccelerationStructureBuildTypeKHR buildType, const VkAccelerationStructureBuildGeometryInfoKHR* pBuildInfo, const deUint32* pMaxPrimitiveCounts, VkAccelerationStructureBuildSizesInfoKHR* pSizeInfo);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdTraceRaysKHRFunc)                                                                                                       (VkCommandBuffer commandBuffer, const VkStridedDeviceAddressRegionKHR* pRaygenShaderBindingTable, const VkStridedDeviceAddressRegionKHR* pMissShaderBindingTable, const VkStridedDeviceAddressRegionKHR* pHitShaderBindingTable, const VkStridedDeviceAddressRegionKHR* pCallableShaderBindingTable, deUint32 width, deUint32 height, deUint32 depth);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CreateRayTracingPipelinesKHRFunc)                                                                          (VkDevice device, VkDeferredOperationKHR deferredOperation, VkPipelineCache pipelineCache, deUint32 createInfoCount, const VkRayTracingPipelineCreateInfoKHR* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkPipeline* pPipelines);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetRayTracingCaptureReplayShaderGroupHandlesKHRFunc)                                       (VkDevice device, VkPipeline pipeline, deUint32 firstGroup, deUint32 groupCount, deUintptr dataSize, void* pData);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetAccelerationStructureBuildSizesKHRFunc)                                                         (VkDevice device, VkAccelerationStructureBuildTypeKHR buildType, const VkAccelerationStructureBuildGeometryInfoKHR* pBuildInfo, const uint32_t* pMaxPrimitiveCounts, VkAccelerationStructureBuildSizesInfoKHR* pSizeInfo);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdTraceRaysKHRFunc)                                                                                                       (VkCommandBuffer commandBuffer, const VkStridedDeviceAddressRegionKHR* pRaygenShaderBindingTable, const VkStridedDeviceAddressRegionKHR* pMissShaderBindingTable, const VkStridedDeviceAddressRegionKHR* pHitShaderBindingTable, const VkStridedDeviceAddressRegionKHR* pCallableShaderBindingTable, uint32_t width, uint32_t height, uint32_t depth);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CreateRayTracingPipelinesKHRFunc)                                                                          (VkDevice device, VkDeferredOperationKHR deferredOperation, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkRayTracingPipelineCreateInfoKHR* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkPipeline* pPipelines);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetRayTracingCaptureReplayShaderGroupHandlesKHRFunc)                                       (VkDevice device, VkPipeline pipeline, uint32_t firstGroup, uint32_t groupCount, deUintptr dataSize, void* pData);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdTraceRaysIndirectKHRFunc)                                                                                       (VkCommandBuffer commandBuffer, const VkStridedDeviceAddressRegionKHR* pRaygenShaderBindingTable, const VkStridedDeviceAddressRegionKHR* pMissShaderBindingTable, const VkStridedDeviceAddressRegionKHR* pHitShaderBindingTable, const VkStridedDeviceAddressRegionKHR* pCallableShaderBindingTable, VkDeviceAddress indirectDeviceAddress);
-typedef VKAPI_ATTR VkDeviceSize                        (VKAPI_CALL* GetRayTracingShaderGroupStackSizeKHRFunc)                                                          (VkDevice device, VkPipeline pipeline, deUint32 group, VkShaderGroupShaderKHR groupShader);
-typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetRayTracingPipelineStackSizeKHRFunc)                                                          (VkCommandBuffer commandBuffer, deUint32 pipelineStackSize);
+typedef VKAPI_ATTR VkDeviceSize                        (VKAPI_CALL* GetRayTracingShaderGroupStackSizeKHRFunc)                                                          (VkDevice device, VkPipeline pipeline, uint32_t group, VkShaderGroupShaderKHR groupShader);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetRayTracingPipelineStackSizeKHRFunc)                                                          (VkCommandBuffer commandBuffer, uint32_t pipelineStackSize);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CreateAndroidSurfaceKHRFunc)                                                                                       (VkInstance instance, const VkAndroidSurfaceCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetAndroidHardwareBufferPropertiesANDROIDFunc)                                                     (VkDevice device, const struct pt::AndroidHardwareBufferPtr buffer, VkAndroidHardwareBufferPropertiesANDROID* pProperties);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetMemoryAndroidHardwareBufferANDROIDFunc)                                                         (VkDevice device, const VkMemoryGetAndroidHardwareBufferInfoANDROID* pInfo, struct pt::AndroidHardwareBufferPtr* pBuffer);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPhysicalDeviceVideoCapabilitiesKHRFunc)                                                         (VkPhysicalDevice physicalDevice, const VkVideoProfileKHR* pVideoProfile, VkVideoCapabilitiesKHR* pCapabilities);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPhysicalDeviceVideoFormatPropertiesKHRFunc)                                                     (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceVideoFormatInfoKHR* pVideoFormatInfo, deUint32* pVideoFormatPropertyCount, VkVideoFormatPropertiesKHR* pVideoFormatProperties);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPhysicalDeviceVideoFormatPropertiesKHRFunc)                                                     (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceVideoFormatInfoKHR* pVideoFormatInfo, uint32_t* pVideoFormatPropertyCount, VkVideoFormatPropertiesKHR* pVideoFormatProperties);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CreateVideoSessionKHRFunc)                                                                                         (VkDevice device, const VkVideoSessionCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkVideoSessionKHR* pVideoSession);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* DestroyVideoSessionKHRFunc)                                                                                        (VkDevice device, VkVideoSessionKHR videoSession, const VkAllocationCallbacks* pAllocator);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetVideoSessionMemoryRequirementsKHRFunc)                                                          (VkDevice device, VkVideoSessionKHR videoSession, deUint32* pVideoSessionMemoryRequirementsCount, VkVideoGetMemoryPropertiesKHR* pVideoSessionMemoryRequirements);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* BindVideoSessionMemoryKHRFunc)                                                                                     (VkDevice device, VkVideoSessionKHR videoSession, deUint32 videoSessionBindMemoryCount, const VkVideoBindMemoryKHR* pVideoSessionBindMemories);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetVideoSessionMemoryRequirementsKHRFunc)                                                          (VkDevice device, VkVideoSessionKHR videoSession, uint32_t* pVideoSessionMemoryRequirementsCount, VkVideoGetMemoryPropertiesKHR* pVideoSessionMemoryRequirements);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* BindVideoSessionMemoryKHRFunc)                                                                                     (VkDevice device, VkVideoSessionKHR videoSession, uint32_t videoSessionBindMemoryCount, const VkVideoBindMemoryKHR* pVideoSessionBindMemories);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CreateVideoSessionParametersKHRFunc)                                                                       (VkDevice device, const VkVideoSessionParametersCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkVideoSessionParametersKHR* pVideoSessionParameters);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* UpdateVideoSessionParametersKHRFunc)                                                                       (VkDevice device, VkVideoSessionParametersKHR videoSessionParameters, const VkVideoSessionParametersUpdateInfoKHR* pUpdateInfo);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* DestroyVideoSessionParametersKHRFunc)                                                                      (VkDevice device, VkVideoSessionParametersKHR videoSessionParameters, const VkAllocationCallbacks* pAllocator);
@@ -470,9 +470,9 @@ typedef VKAPI_ATTR VkResult                         (VKAPI_CALL* CreateMacOSSurfaceMVKFunc)
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CreateMetalSurfaceEXTFunc)                                                                                         (VkInstance instance, const VkMetalSurfaceCreateInfoEXT* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CreateViSurfaceNNFunc)                                                                                                     (VkInstance instance, const VkViSurfaceCreateInfoNN* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CreateWaylandSurfaceKHRFunc)                                                                                       (VkInstance instance, const VkWaylandSurfaceCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface);
-typedef VKAPI_ATTR VkBool32                            (VKAPI_CALL* GetPhysicalDeviceWaylandPresentationSupportKHRFunc)                                        (VkPhysicalDevice physicalDevice, deUint32 queueFamilyIndex, pt::WaylandDisplayPtr display);
+typedef VKAPI_ATTR VkBool32                            (VKAPI_CALL* GetPhysicalDeviceWaylandPresentationSupportKHRFunc)                                        (VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, pt::WaylandDisplayPtr display);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CreateWin32SurfaceKHRFunc)                                                                                         (VkInstance instance, const VkWin32SurfaceCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface);
-typedef VKAPI_ATTR VkBool32                            (VKAPI_CALL* GetPhysicalDeviceWin32PresentationSupportKHRFunc)                                          (VkPhysicalDevice physicalDevice, deUint32 queueFamilyIndex);
+typedef VKAPI_ATTR VkBool32                            (VKAPI_CALL* GetPhysicalDeviceWin32PresentationSupportKHRFunc)                                          (VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetMemoryWin32HandleKHRFunc)                                                                                       (VkDevice device, const VkMemoryGetWin32HandleInfoKHR* pGetWin32HandleInfo, pt::Win32Handle* pHandle);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetMemoryWin32HandlePropertiesKHRFunc)                                                                     (VkDevice device, VkExternalMemoryHandleTypeFlagBits handleType, pt::Win32Handle handle, VkMemoryWin32HandlePropertiesKHR* pMemoryWin32HandleProperties);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* ImportSemaphoreWin32HandleKHRFunc)                                                                         (VkDevice device, const VkImportSemaphoreWin32HandleInfoKHR* pImportSemaphoreWin32HandleInfo);
@@ -480,13 +480,13 @@ typedef VKAPI_ATTR VkResult                               (VKAPI_CALL* GetSemaphoreWin32HandleKHRFunc)
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* ImportFenceWin32HandleKHRFunc)                                                                                     (VkDevice device, const VkImportFenceWin32HandleInfoKHR* pImportFenceWin32HandleInfo);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetFenceWin32HandleKHRFunc)                                                                                        (VkDevice device, const VkFenceGetWin32HandleInfoKHR* pGetWin32HandleInfo, pt::Win32Handle* pHandle);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetMemoryWin32HandleNVFunc)                                                                                        (VkDevice device, VkDeviceMemory memory, VkExternalMemoryHandleTypeFlagsNV handleType, pt::Win32Handle* pHandle);
-typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPhysicalDeviceSurfacePresentModes2EXTFunc)                                                      (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo, deUint32* pPresentModeCount, VkPresentModeKHR* pPresentModes);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetPhysicalDeviceSurfacePresentModes2EXTFunc)                                                      (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo, uint32_t* pPresentModeCount, VkPresentModeKHR* pPresentModes);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* AcquireFullScreenExclusiveModeEXTFunc)                                                                     (VkDevice device, VkSwapchainKHR swapchain);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* ReleaseFullScreenExclusiveModeEXTFunc)                                                                     (VkDevice device, VkSwapchainKHR swapchain);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetDeviceGroupSurfacePresentModes2EXTFunc)                                                         (VkDevice device, const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo, VkDeviceGroupPresentModeFlagsKHR* pModes);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CreateXcbSurfaceKHRFunc)                                                                                           (VkInstance instance, const VkXcbSurfaceCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface);
-typedef VKAPI_ATTR VkBool32                            (VKAPI_CALL* GetPhysicalDeviceXcbPresentationSupportKHRFunc)                                            (VkPhysicalDevice physicalDevice, deUint32 queueFamilyIndex, pt::XcbConnectionPtr connection, pt::XcbVisualid visual_id);
+typedef VKAPI_ATTR VkBool32                            (VKAPI_CALL* GetPhysicalDeviceXcbPresentationSupportKHRFunc)                                            (VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, pt::XcbConnectionPtr connection, pt::XcbVisualid visual_id);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* CreateXlibSurfaceKHRFunc)                                                                                          (VkInstance instance, const VkXlibSurfaceCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface);
-typedef VKAPI_ATTR VkBool32                            (VKAPI_CALL* GetPhysicalDeviceXlibPresentationSupportKHRFunc)                                           (VkPhysicalDevice physicalDevice, deUint32 queueFamilyIndex, pt::XlibDisplayPtr dpy, pt::XlibVisualID visualID);
+typedef VKAPI_ATTR VkBool32                            (VKAPI_CALL* GetPhysicalDeviceXlibPresentationSupportKHRFunc)                                           (VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, pt::XlibDisplayPtr dpy, pt::XlibVisualID visualID);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* AcquireXlibDisplayEXTFunc)                                                                                         (VkPhysicalDevice physicalDevice, pt::XlibDisplayPtr dpy, VkDisplayKHR display);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* GetRandROutputDisplayEXTFunc)                                                                                      (VkPhysicalDevice physicalDevice, pt::XlibDisplayPtr dpy, pt::RROutput rrOutput, VkDisplayKHR* pDisplay);
index f8de81b..cd33287 100644 (file)
@@ -7,7 +7,7 @@ void InstanceDriver::destroyInstance (VkInstance instance, const VkAllocationCal
        m_vk.destroyInstance(instance, pAllocator);
 }
 
-VkResult InstanceDriver::enumeratePhysicalDevices (VkInstance instance, deUint32* pPhysicalDeviceCount, VkPhysicalDevice* pPhysicalDevices) const
+VkResult InstanceDriver::enumeratePhysicalDevices (VkInstance instance, uint32_t* pPhysicalDeviceCount, VkPhysicalDevice* pPhysicalDevices) const
 {
        return m_vk.enumeratePhysicalDevices(instance, pPhysicalDeviceCount, pPhysicalDevices);
 }
@@ -32,7 +32,7 @@ void InstanceDriver::getPhysicalDeviceProperties (VkPhysicalDevice physicalDevic
        m_vk.getPhysicalDeviceProperties(physicalDevice, pProperties);
 }
 
-void InstanceDriver::getPhysicalDeviceQueueFamilyProperties (VkPhysicalDevice physicalDevice, deUint32* pQueueFamilyPropertyCount, VkQueueFamilyProperties* pQueueFamilyProperties) const
+void InstanceDriver::getPhysicalDeviceQueueFamilyProperties (VkPhysicalDevice physicalDevice, uint32_t* pQueueFamilyPropertyCount, VkQueueFamilyProperties* pQueueFamilyProperties) const
 {
        m_vk.getPhysicalDeviceQueueFamilyProperties(physicalDevice, pQueueFamilyPropertyCount, pQueueFamilyProperties);
 }
@@ -47,22 +47,22 @@ VkResult InstanceDriver::createDevice (VkPhysicalDevice physicalDevice, const Vk
        return m_vk.createDevice(physicalDevice, pCreateInfo, pAllocator, pDevice);
 }
 
-VkResult InstanceDriver::enumerateDeviceExtensionProperties (VkPhysicalDevice physicalDevice, const char* pLayerName, deUint32* pPropertyCount, VkExtensionProperties* pProperties) const
+VkResult InstanceDriver::enumerateDeviceExtensionProperties (VkPhysicalDevice physicalDevice, const char* pLayerName, uint32_t* pPropertyCount, VkExtensionProperties* pProperties) const
 {
        return m_vk.enumerateDeviceExtensionProperties(physicalDevice, pLayerName, pPropertyCount, pProperties);
 }
 
-VkResult InstanceDriver::enumerateDeviceLayerProperties (VkPhysicalDevice physicalDevice, deUint32* pPropertyCount, VkLayerProperties* pProperties) const
+VkResult InstanceDriver::enumerateDeviceLayerProperties (VkPhysicalDevice physicalDevice, uint32_t* pPropertyCount, VkLayerProperties* pProperties) const
 {
        return m_vk.enumerateDeviceLayerProperties(physicalDevice, pPropertyCount, pProperties);
 }
 
-void InstanceDriver::getPhysicalDeviceSparseImageFormatProperties (VkPhysicalDevice physicalDevice, VkFormat format, VkImageType type, VkSampleCountFlagBits samples, VkImageUsageFlags usage, VkImageTiling tiling, deUint32* pPropertyCount, VkSparseImageFormatProperties* pProperties) const
+void InstanceDriver::getPhysicalDeviceSparseImageFormatProperties (VkPhysicalDevice physicalDevice, VkFormat format, VkImageType type, VkSampleCountFlagBits samples, VkImageUsageFlags usage, VkImageTiling tiling, uint32_t* pPropertyCount, VkSparseImageFormatProperties* pProperties) const
 {
        m_vk.getPhysicalDeviceSparseImageFormatProperties(physicalDevice, format, type, samples, usage, tiling, pPropertyCount, pProperties);
 }
 
-VkResult InstanceDriver::enumeratePhysicalDeviceGroups (VkInstance instance, deUint32* pPhysicalDeviceGroupCount, VkPhysicalDeviceGroupProperties* pPhysicalDeviceGroupProperties) const
+VkResult InstanceDriver::enumeratePhysicalDeviceGroups (VkInstance instance, uint32_t* pPhysicalDeviceGroupCount, VkPhysicalDeviceGroupProperties* pPhysicalDeviceGroupProperties) const
 {
        return m_vk.enumeratePhysicalDeviceGroups(instance, pPhysicalDeviceGroupCount, pPhysicalDeviceGroupProperties);
 }
@@ -107,7 +107,7 @@ VkResult InstanceDriver::getPhysicalDeviceImageFormatProperties2 (VkPhysicalDevi
                return m_vk.getPhysicalDeviceImageFormatProperties2KHR(physicalDevice, pImageFormatInfo, pImageFormatProperties);
 }
 
-void InstanceDriver::getPhysicalDeviceQueueFamilyProperties2 (VkPhysicalDevice physicalDevice, deUint32* pQueueFamilyPropertyCount, VkQueueFamilyProperties2* pQueueFamilyProperties) const
+void InstanceDriver::getPhysicalDeviceQueueFamilyProperties2 (VkPhysicalDevice physicalDevice, uint32_t* pQueueFamilyPropertyCount, VkQueueFamilyProperties2* pQueueFamilyProperties) const
 {
        vk::VkPhysicalDeviceProperties props;
        m_vk.getPhysicalDeviceProperties(physicalDevice, &props);
@@ -127,7 +127,7 @@ void InstanceDriver::getPhysicalDeviceMemoryProperties2 (VkPhysicalDevice physic
                m_vk.getPhysicalDeviceMemoryProperties2KHR(physicalDevice, pMemoryProperties);
 }
 
-void InstanceDriver::getPhysicalDeviceSparseImageFormatProperties2 (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSparseImageFormatInfo2* pFormatInfo, deUint32* pPropertyCount, VkSparseImageFormatProperties2* pProperties) const
+void InstanceDriver::getPhysicalDeviceSparseImageFormatProperties2 (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSparseImageFormatInfo2* pFormatInfo, uint32_t* pPropertyCount, VkSparseImageFormatProperties2* pProperties) const
 {
        vk::VkPhysicalDeviceProperties props;
        m_vk.getPhysicalDeviceProperties(physicalDevice, &props);
@@ -172,7 +172,7 @@ void InstanceDriver::destroySurfaceKHR (VkInstance instance, VkSurfaceKHR surfac
        m_vk.destroySurfaceKHR(instance, surface, pAllocator);
 }
 
-VkResult InstanceDriver::getPhysicalDeviceSurfaceSupportKHR (VkPhysicalDevice physicalDevice, deUint32 queueFamilyIndex, VkSurfaceKHR surface, VkBool32* pSupported) const
+VkResult InstanceDriver::getPhysicalDeviceSurfaceSupportKHR (VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, VkSurfaceKHR surface, VkBool32* pSupported) const
 {
        return m_vk.getPhysicalDeviceSurfaceSupportKHR(physicalDevice, queueFamilyIndex, surface, pSupported);
 }
@@ -182,37 +182,37 @@ VkResult InstanceDriver::getPhysicalDeviceSurfaceCapabilitiesKHR (VkPhysicalDevi
        return m_vk.getPhysicalDeviceSurfaceCapabilitiesKHR(physicalDevice, surface, pSurfaceCapabilities);
 }
 
-VkResult InstanceDriver::getPhysicalDeviceSurfaceFormatsKHR (VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, deUint32* pSurfaceFormatCount, VkSurfaceFormatKHR* pSurfaceFormats) const
+VkResult InstanceDriver::getPhysicalDeviceSurfaceFormatsKHR (VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, uint32_t* pSurfaceFormatCount, VkSurfaceFormatKHR* pSurfaceFormats) const
 {
        return m_vk.getPhysicalDeviceSurfaceFormatsKHR(physicalDevice, surface, pSurfaceFormatCount, pSurfaceFormats);
 }
 
-VkResult InstanceDriver::getPhysicalDeviceSurfacePresentModesKHR (VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, deUint32* pPresentModeCount, VkPresentModeKHR* pPresentModes) const
+VkResult InstanceDriver::getPhysicalDeviceSurfacePresentModesKHR (VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, uint32_t* pPresentModeCount, VkPresentModeKHR* pPresentModes) const
 {
        return m_vk.getPhysicalDeviceSurfacePresentModesKHR(physicalDevice, surface, pPresentModeCount, pPresentModes);
 }
 
-VkResult InstanceDriver::getPhysicalDevicePresentRectanglesKHR (VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, deUint32* pRectCount, VkRect2D* pRects) const
+VkResult InstanceDriver::getPhysicalDevicePresentRectanglesKHR (VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, uint32_t* pRectCount, VkRect2D* pRects) const
 {
        return m_vk.getPhysicalDevicePresentRectanglesKHR(physicalDevice, surface, pRectCount, pRects);
 }
 
-VkResult InstanceDriver::getPhysicalDeviceDisplayPropertiesKHR (VkPhysicalDevice physicalDevice, deUint32* pPropertyCount, VkDisplayPropertiesKHR* pProperties) const
+VkResult InstanceDriver::getPhysicalDeviceDisplayPropertiesKHR (VkPhysicalDevice physicalDevice, uint32_t* pPropertyCount, VkDisplayPropertiesKHR* pProperties) const
 {
        return m_vk.getPhysicalDeviceDisplayPropertiesKHR(physicalDevice, pPropertyCount, pProperties);
 }
 
-VkResult InstanceDriver::getPhysicalDeviceDisplayPlanePropertiesKHR (VkPhysicalDevice physicalDevice, deUint32* pPropertyCount, VkDisplayPlanePropertiesKHR* pProperties) const
+VkResult InstanceDriver::getPhysicalDeviceDisplayPlanePropertiesKHR (VkPhysicalDevice physicalDevice, uint32_t* pPropertyCount, VkDisplayPlanePropertiesKHR* pProperties) const
 {
        return m_vk.getPhysicalDeviceDisplayPlanePropertiesKHR(physicalDevice, pPropertyCount, pProperties);
 }
 
-VkResult InstanceDriver::getDisplayPlaneSupportedDisplaysKHR (VkPhysicalDevice physicalDevice, deUint32 planeIndex, deUint32* pDisplayCount, VkDisplayKHR* pDisplays) const
+VkResult InstanceDriver::getDisplayPlaneSupportedDisplaysKHR (VkPhysicalDevice physicalDevice, uint32_t planeIndex, uint32_t* pDisplayCount, VkDisplayKHR* pDisplays) const
 {
        return m_vk.getDisplayPlaneSupportedDisplaysKHR(physicalDevice, planeIndex, pDisplayCount, pDisplays);
 }
 
-VkResult InstanceDriver::getDisplayModePropertiesKHR (VkPhysicalDevice physicalDevice, VkDisplayKHR display, deUint32* pPropertyCount, VkDisplayModePropertiesKHR* pProperties) const
+VkResult InstanceDriver::getDisplayModePropertiesKHR (VkPhysicalDevice physicalDevice, VkDisplayKHR display, uint32_t* pPropertyCount, VkDisplayModePropertiesKHR* pProperties) const
 {
        return m_vk.getDisplayModePropertiesKHR(physicalDevice, display, pPropertyCount, pProperties);
 }
@@ -222,7 +222,7 @@ VkResult InstanceDriver::createDisplayModeKHR (VkPhysicalDevice physicalDevice,
        return m_vk.createDisplayModeKHR(physicalDevice, display, pCreateInfo, pAllocator, pMode);
 }
 
-VkResult InstanceDriver::getDisplayPlaneCapabilitiesKHR (VkPhysicalDevice physicalDevice, VkDisplayModeKHR mode, deUint32 planeIndex, VkDisplayPlaneCapabilitiesKHR* pCapabilities) const
+VkResult InstanceDriver::getDisplayPlaneCapabilitiesKHR (VkPhysicalDevice physicalDevice, VkDisplayModeKHR mode, uint32_t planeIndex, VkDisplayPlaneCapabilitiesKHR* pCapabilities) const
 {
        return m_vk.getDisplayPlaneCapabilitiesKHR(physicalDevice, mode, planeIndex, pCapabilities);
 }
@@ -232,12 +232,12 @@ VkResult InstanceDriver::createDisplayPlaneSurfaceKHR (VkInstance instance, cons
        return m_vk.createDisplayPlaneSurfaceKHR(instance, pCreateInfo, pAllocator, pSurface);
 }
 
-VkResult InstanceDriver::enumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR (VkPhysicalDevice physicalDevice, deUint32 queueFamilyIndex, deUint32* pCounterCount, VkPerformanceCounterKHR* pCounters, VkPerformanceCounterDescriptionKHR* pCounterDescriptions) const
+VkResult InstanceDriver::enumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR (VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, uint32_t* pCounterCount, VkPerformanceCounterKHR* pCounters, VkPerformanceCounterDescriptionKHR* pCounterDescriptions) const
 {
        return m_vk.enumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR(physicalDevice, queueFamilyIndex, pCounterCount, pCounters, pCounterDescriptions);
 }
 
-void InstanceDriver::getPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR (VkPhysicalDevice physicalDevice, const VkQueryPoolPerformanceCreateInfoKHR* pPerformanceQueryCreateInfo, deUint32* pNumPasses) const
+void InstanceDriver::getPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR (VkPhysicalDevice physicalDevice, const VkQueryPoolPerformanceCreateInfoKHR* pPerformanceQueryCreateInfo, uint32_t* pNumPasses) const
 {
        m_vk.getPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR(physicalDevice, pPerformanceQueryCreateInfo, pNumPasses);
 }
@@ -247,22 +247,22 @@ VkResult InstanceDriver::getPhysicalDeviceSurfaceCapabilities2KHR (VkPhysicalDev
        return m_vk.getPhysicalDeviceSurfaceCapabilities2KHR(physicalDevice, pSurfaceInfo, pSurfaceCapabilities);
 }
 
-VkResult InstanceDriver::getPhysicalDeviceSurfaceFormats2KHR (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo, deUint32* pSurfaceFormatCount, VkSurfaceFormat2KHR* pSurfaceFormats) const
+VkResult InstanceDriver::getPhysicalDeviceSurfaceFormats2KHR (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo, uint32_t* pSurfaceFormatCount, VkSurfaceFormat2KHR* pSurfaceFormats) const
 {
        return m_vk.getPhysicalDeviceSurfaceFormats2KHR(physicalDevice, pSurfaceInfo, pSurfaceFormatCount, pSurfaceFormats);
 }
 
-VkResult InstanceDriver::getPhysicalDeviceDisplayProperties2KHR (VkPhysicalDevice physicalDevice, deUint32* pPropertyCount, VkDisplayProperties2KHR* pProperties) const
+VkResult InstanceDriver::getPhysicalDeviceDisplayProperties2KHR (VkPhysicalDevice physicalDevice, uint32_t* pPropertyCount, VkDisplayProperties2KHR* pProperties) const
 {
        return m_vk.getPhysicalDeviceDisplayProperties2KHR(physicalDevice, pPropertyCount, pProperties);
 }
 
-VkResult InstanceDriver::getPhysicalDeviceDisplayPlaneProperties2KHR (VkPhysicalDevice physicalDevice, deUint32* pPropertyCount, VkDisplayPlaneProperties2KHR* pProperties) const
+VkResult InstanceDriver::getPhysicalDeviceDisplayPlaneProperties2KHR (VkPhysicalDevice physicalDevice, uint32_t* pPropertyCount, VkDisplayPlaneProperties2KHR* pProperties) const
 {
        return m_vk.getPhysicalDeviceDisplayPlaneProperties2KHR(physicalDevice, pPropertyCount, pProperties);
 }
 
-VkResult InstanceDriver::getDisplayModeProperties2KHR (VkPhysicalDevice physicalDevice, VkDisplayKHR display, deUint32* pPropertyCount, VkDisplayModeProperties2KHR* pProperties) const
+VkResult InstanceDriver::getDisplayModeProperties2KHR (VkPhysicalDevice physicalDevice, VkDisplayKHR display, uint32_t* pPropertyCount, VkDisplayModeProperties2KHR* pProperties) const
 {
        return m_vk.getDisplayModeProperties2KHR(physicalDevice, display, pPropertyCount, pProperties);
 }
@@ -272,7 +272,7 @@ VkResult InstanceDriver::getDisplayPlaneCapabilities2KHR (VkPhysicalDevice physi
        return m_vk.getDisplayPlaneCapabilities2KHR(physicalDevice, pDisplayPlaneInfo, pCapabilities);
 }
 
-VkResult InstanceDriver::getPhysicalDeviceFragmentShadingRatesKHR (VkPhysicalDevice physicalDevice, deUint32* pFragmentShadingRateCount, VkPhysicalDeviceFragmentShadingRateKHR* pFragmentShadingRates) const
+VkResult InstanceDriver::getPhysicalDeviceFragmentShadingRatesKHR (VkPhysicalDevice physicalDevice, uint32_t* pFragmentShadingRateCount, VkPhysicalDeviceFragmentShadingRateKHR* pFragmentShadingRates) const
 {
        return m_vk.getPhysicalDeviceFragmentShadingRatesKHR(physicalDevice, pFragmentShadingRateCount, pFragmentShadingRates);
 }
@@ -287,7 +287,7 @@ void InstanceDriver::destroyDebugReportCallbackEXT (VkInstance instance, VkDebug
        m_vk.destroyDebugReportCallbackEXT(instance, callback, pAllocator);
 }
 
-void InstanceDriver::debugReportMessageEXT (VkInstance instance, VkDebugReportFlagsEXT flags, VkDebugReportObjectTypeEXT objectType, deUint64 object, deUintptr location, deInt32 messageCode, const char* pLayerPrefix, const char* pMessage) const
+void InstanceDriver::debugReportMessageEXT (VkInstance instance, VkDebugReportFlagsEXT flags, VkDebugReportObjectTypeEXT objectType, deUint64 object, deUintptr location, int32_t messageCode, const char* pLayerPrefix, const char* pMessage) const
 {
        m_vk.debugReportMessageEXT(instance, flags, objectType, object, location, messageCode, pLayerPrefix, pMessage);
 }
@@ -327,22 +327,22 @@ void InstanceDriver::getPhysicalDeviceMultisamplePropertiesEXT (VkPhysicalDevice
        m_vk.getPhysicalDeviceMultisamplePropertiesEXT(physicalDevice, samples, pMultisampleProperties);
 }
 
-VkResult InstanceDriver::getPhysicalDeviceCalibrateableTimeDomainsEXT (VkPhysicalDevice physicalDevice, deUint32* pTimeDomainCount, VkTimeDomainEXT* pTimeDomains) const
+VkResult InstanceDriver::getPhysicalDeviceCalibrateableTimeDomainsEXT (VkPhysicalDevice physicalDevice, uint32_t* pTimeDomainCount, VkTimeDomainEXT* pTimeDomains) const
 {
        return m_vk.getPhysicalDeviceCalibrateableTimeDomainsEXT(physicalDevice, pTimeDomainCount, pTimeDomains);
 }
 
-VkResult InstanceDriver::getPhysicalDeviceToolPropertiesEXT (VkPhysicalDevice physicalDevice, deUint32* pToolCount, VkPhysicalDeviceToolPropertiesEXT* pToolProperties) const
+VkResult InstanceDriver::getPhysicalDeviceToolPropertiesEXT (VkPhysicalDevice physicalDevice, uint32_t* pToolCount, VkPhysicalDeviceToolPropertiesEXT* pToolProperties) const
 {
        return m_vk.getPhysicalDeviceToolPropertiesEXT(physicalDevice, pToolCount, pToolProperties);
 }
 
-VkResult InstanceDriver::getPhysicalDeviceCooperativeMatrixPropertiesNV (VkPhysicalDevice physicalDevice, deUint32* pPropertyCount, VkCooperativeMatrixPropertiesNV* pProperties) const
+VkResult InstanceDriver::getPhysicalDeviceCooperativeMatrixPropertiesNV (VkPhysicalDevice physicalDevice, uint32_t* pPropertyCount, VkCooperativeMatrixPropertiesNV* pProperties) const
 {
        return m_vk.getPhysicalDeviceCooperativeMatrixPropertiesNV(physicalDevice, pPropertyCount, pProperties);
 }
 
-VkResult InstanceDriver::getPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV (VkPhysicalDevice physicalDevice, deUint32* pCombinationCount, VkFramebufferMixedSamplesCombinationNV* pCombinations) const
+VkResult InstanceDriver::getPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV (VkPhysicalDevice physicalDevice, uint32_t* pCombinationCount, VkFramebufferMixedSamplesCombinationNV* pCombinations) const
 {
        return m_vk.getPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV(physicalDevice, pCombinationCount, pCombinations);
 }
@@ -352,12 +352,12 @@ VkResult InstanceDriver::createHeadlessSurfaceEXT (VkInstance instance, const Vk
        return m_vk.createHeadlessSurfaceEXT(instance, pCreateInfo, pAllocator, pSurface);
 }
 
-VkResult InstanceDriver::acquireDrmDisplayEXT (VkPhysicalDevice physicalDevice, deInt32 drmFd, VkDisplayKHR display) const
+VkResult InstanceDriver::acquireDrmDisplayEXT (VkPhysicalDevice physicalDevice, int32_t drmFd, VkDisplayKHR display) const
 {
        return m_vk.acquireDrmDisplayEXT(physicalDevice, drmFd, display);
 }
 
-VkResult InstanceDriver::getDrmDisplayEXT (VkPhysicalDevice physicalDevice, deInt32 drmFd, deUint32 connectorId, VkDisplayKHR* display) const
+VkResult InstanceDriver::getDrmDisplayEXT (VkPhysicalDevice physicalDevice, int32_t drmFd, uint32_t connectorId, VkDisplayKHR* display) const
 {
        return m_vk.getDrmDisplayEXT(physicalDevice, drmFd, connectorId, display);
 }
@@ -367,7 +367,7 @@ VkResult InstanceDriver::acquireWinrtDisplayNV (VkPhysicalDevice physicalDevice,
        return m_vk.acquireWinrtDisplayNV(physicalDevice, display);
 }
 
-VkResult InstanceDriver::getWinrtDisplayNV (VkPhysicalDevice physicalDevice, deUint32 deviceRelativeId, VkDisplayKHR* pDisplay) const
+VkResult InstanceDriver::getWinrtDisplayNV (VkPhysicalDevice physicalDevice, uint32_t deviceRelativeId, VkDisplayKHR* pDisplay) const
 {
        return m_vk.getWinrtDisplayNV(physicalDevice, deviceRelativeId, pDisplay);
 }
@@ -382,7 +382,7 @@ VkResult InstanceDriver::getPhysicalDeviceVideoCapabilitiesKHR (VkPhysicalDevice
        return m_vk.getPhysicalDeviceVideoCapabilitiesKHR(physicalDevice, pVideoProfile, pCapabilities);
 }
 
-VkResult InstanceDriver::getPhysicalDeviceVideoFormatPropertiesKHR (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceVideoFormatInfoKHR* pVideoFormatInfo, deUint32* pVideoFormatPropertyCount, VkVideoFormatPropertiesKHR* pVideoFormatProperties) const
+VkResult InstanceDriver::getPhysicalDeviceVideoFormatPropertiesKHR (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceVideoFormatInfoKHR* pVideoFormatInfo, uint32_t* pVideoFormatPropertyCount, VkVideoFormatPropertiesKHR* pVideoFormatProperties) const
 {
        return m_vk.getPhysicalDeviceVideoFormatPropertiesKHR(physicalDevice, pVideoFormatInfo, pVideoFormatPropertyCount, pVideoFormatProperties);
 }
@@ -422,7 +422,7 @@ VkResult InstanceDriver::createWaylandSurfaceKHR (VkInstance instance, const VkW
        return m_vk.createWaylandSurfaceKHR(instance, pCreateInfo, pAllocator, pSurface);
 }
 
-VkBool32 InstanceDriver::getPhysicalDeviceWaylandPresentationSupportKHR (VkPhysicalDevice physicalDevice, deUint32 queueFamilyIndex, pt::WaylandDisplayPtr display) const
+VkBool32 InstanceDriver::getPhysicalDeviceWaylandPresentationSupportKHR (VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, pt::WaylandDisplayPtr display) const
 {
        return m_vk.getPhysicalDeviceWaylandPresentationSupportKHR(physicalDevice, queueFamilyIndex, display);
 }
@@ -432,12 +432,12 @@ VkResult InstanceDriver::createWin32SurfaceKHR (VkInstance instance, const VkWin
        return m_vk.createWin32SurfaceKHR(instance, pCreateInfo, pAllocator, pSurface);
 }
 
-VkBool32 InstanceDriver::getPhysicalDeviceWin32PresentationSupportKHR (VkPhysicalDevice physicalDevice, deUint32 queueFamilyIndex) const
+VkBool32 InstanceDriver::getPhysicalDeviceWin32PresentationSupportKHR (VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex) const
 {
        return m_vk.getPhysicalDeviceWin32PresentationSupportKHR(physicalDevice, queueFamilyIndex);
 }
 
-VkResult InstanceDriver::getPhysicalDeviceSurfacePresentModes2EXT (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo, deUint32* pPresentModeCount, VkPresentModeKHR* pPresentModes) const
+VkResult InstanceDriver::getPhysicalDeviceSurfacePresentModes2EXT (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo, uint32_t* pPresentModeCount, VkPresentModeKHR* pPresentModes) const
 {
        return m_vk.getPhysicalDeviceSurfacePresentModes2EXT(physicalDevice, pSurfaceInfo, pPresentModeCount, pPresentModes);
 }
@@ -447,7 +447,7 @@ VkResult InstanceDriver::createXcbSurfaceKHR (VkInstance instance, const VkXcbSu
        return m_vk.createXcbSurfaceKHR(instance, pCreateInfo, pAllocator, pSurface);
 }
 
-VkBool32 InstanceDriver::getPhysicalDeviceXcbPresentationSupportKHR (VkPhysicalDevice physicalDevice, deUint32 queueFamilyIndex, pt::XcbConnectionPtr connection, pt::XcbVisualid visual_id) const
+VkBool32 InstanceDriver::getPhysicalDeviceXcbPresentationSupportKHR (VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, pt::XcbConnectionPtr connection, pt::XcbVisualid visual_id) const
 {
        return m_vk.getPhysicalDeviceXcbPresentationSupportKHR(physicalDevice, queueFamilyIndex, connection, visual_id);
 }
@@ -457,7 +457,7 @@ VkResult InstanceDriver::createXlibSurfaceKHR (VkInstance instance, const VkXlib
        return m_vk.createXlibSurfaceKHR(instance, pCreateInfo, pAllocator, pSurface);
 }
 
-VkBool32 InstanceDriver::getPhysicalDeviceXlibPresentationSupportKHR (VkPhysicalDevice physicalDevice, deUint32 queueFamilyIndex, pt::XlibDisplayPtr dpy, pt::XlibVisualID visualID) const
+VkBool32 InstanceDriver::getPhysicalDeviceXlibPresentationSupportKHR (VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, pt::XlibDisplayPtr dpy, pt::XlibVisualID visualID) const
 {
        return m_vk.getPhysicalDeviceXlibPresentationSupportKHR(physicalDevice, queueFamilyIndex, dpy, visualID);
 }
index 1d80271..576c845 100644 (file)
@@ -4,7 +4,7 @@
 static const struct
 {
        std::string driver;
-       deUint32 id;
+       uint32_t id;
 } driverIds [] =
 {
        {"VK_DRIVER_ID_AMD_PROPRIETARY", 1},
index 4f036c8..12544dd 100644 (file)
@@ -509,14 +509,14 @@ VKAPI_ATTR void VKAPI_CALL destroyVideoSessionParametersKHR (VkDevice device, Vk
        freeNonDispHandle<VideoSessionParametersKHR, VkVideoSessionParametersKHR>(videoSessionParameters, pAllocator);
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL enumerateInstanceLayerProperties (deUint32* pPropertyCount, VkLayerProperties* pProperties)
+VKAPI_ATTR VkResult VKAPI_CALL enumerateInstanceLayerProperties (uint32_t* pPropertyCount, VkLayerProperties* pProperties)
 {
        DE_UNREF(pPropertyCount);
        DE_UNREF(pProperties);
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL enumerateDeviceLayerProperties (VkPhysicalDevice physicalDevice, deUint32* pPropertyCount, VkLayerProperties* pProperties)
+VKAPI_ATTR VkResult VKAPI_CALL enumerateDeviceLayerProperties (VkPhysicalDevice physicalDevice, uint32_t* pPropertyCount, VkLayerProperties* pProperties)
 {
        DE_UNREF(physicalDevice);
        DE_UNREF(pPropertyCount);
@@ -524,7 +524,7 @@ VKAPI_ATTR VkResult VKAPI_CALL enumerateDeviceLayerProperties (VkPhysicalDevice
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL queueSubmit (VkQueue queue, deUint32 submitCount, const VkSubmitInfo* pSubmits, VkFence fence)
+VKAPI_ATTR VkResult VKAPI_CALL queueSubmit (VkQueue queue, uint32_t submitCount, const VkSubmitInfo* pSubmits, VkFence fence)
 {
        DE_UNREF(queue);
        DE_UNREF(submitCount);
@@ -545,7 +545,7 @@ VKAPI_ATTR VkResult VKAPI_CALL deviceWaitIdle (VkDevice device)
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL flushMappedMemoryRanges (VkDevice device, deUint32 memoryRangeCount, const VkMappedMemoryRange* pMemoryRanges)
+VKAPI_ATTR VkResult VKAPI_CALL flushMappedMemoryRanges (VkDevice device, uint32_t memoryRangeCount, const VkMappedMemoryRange* pMemoryRanges)
 {
        DE_UNREF(device);
        DE_UNREF(memoryRangeCount);
@@ -553,7 +553,7 @@ VKAPI_ATTR VkResult VKAPI_CALL flushMappedMemoryRanges (VkDevice device, deUint3
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL invalidateMappedMemoryRanges (VkDevice device, deUint32 memoryRangeCount, const VkMappedMemoryRange* pMemoryRanges)
+VKAPI_ATTR VkResult VKAPI_CALL invalidateMappedMemoryRanges (VkDevice device, uint32_t memoryRangeCount, const VkMappedMemoryRange* pMemoryRanges)
 {
        DE_UNREF(device);
        DE_UNREF(memoryRangeCount);
@@ -586,7 +586,7 @@ VKAPI_ATTR VkResult VKAPI_CALL bindImageMemory (VkDevice device, VkImage image,
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR void VKAPI_CALL getImageSparseMemoryRequirements (VkDevice device, VkImage image, deUint32* pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements* pSparseMemoryRequirements)
+VKAPI_ATTR void VKAPI_CALL getImageSparseMemoryRequirements (VkDevice device, VkImage image, uint32_t* pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements* pSparseMemoryRequirements)
 {
        DE_UNREF(device);
        DE_UNREF(image);
@@ -594,7 +594,7 @@ VKAPI_ATTR void VKAPI_CALL getImageSparseMemoryRequirements (VkDevice device, Vk
        DE_UNREF(pSparseMemoryRequirements);
 }
 
-VKAPI_ATTR void VKAPI_CALL getPhysicalDeviceSparseImageFormatProperties (VkPhysicalDevice physicalDevice, VkFormat format, VkImageType type, VkSampleCountFlagBits samples, VkImageUsageFlags usage, VkImageTiling tiling, deUint32* pPropertyCount, VkSparseImageFormatProperties* pProperties)
+VKAPI_ATTR void VKAPI_CALL getPhysicalDeviceSparseImageFormatProperties (VkPhysicalDevice physicalDevice, VkFormat format, VkImageType type, VkSampleCountFlagBits samples, VkImageUsageFlags usage, VkImageTiling tiling, uint32_t* pPropertyCount, VkSparseImageFormatProperties* pProperties)
 {
        DE_UNREF(physicalDevice);
        DE_UNREF(format);
@@ -606,7 +606,7 @@ VKAPI_ATTR void VKAPI_CALL getPhysicalDeviceSparseImageFormatProperties (VkPhysi
        DE_UNREF(pProperties);
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL queueBindSparse (VkQueue queue, deUint32 bindInfoCount, const VkBindSparseInfo* pBindInfo, VkFence fence)
+VKAPI_ATTR VkResult VKAPI_CALL queueBindSparse (VkQueue queue, uint32_t bindInfoCount, const VkBindSparseInfo* pBindInfo, VkFence fence)
 {
        DE_UNREF(queue);
        DE_UNREF(bindInfoCount);
@@ -615,7 +615,7 @@ VKAPI_ATTR VkResult VKAPI_CALL queueBindSparse (VkQueue queue, deUint32 bindInfo
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL resetFences (VkDevice device, deUint32 fenceCount, const VkFence* pFences)
+VKAPI_ATTR VkResult VKAPI_CALL resetFences (VkDevice device, uint32_t fenceCount, const VkFence* pFences)
 {
        DE_UNREF(device);
        DE_UNREF(fenceCount);
@@ -630,7 +630,7 @@ VKAPI_ATTR VkResult VKAPI_CALL getFenceStatus (VkDevice device, VkFence fence)
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL waitForFences (VkDevice device, deUint32 fenceCount, const VkFence* pFences, VkBool32 waitAll, deUint64 timeout)
+VKAPI_ATTR VkResult VKAPI_CALL waitForFences (VkDevice device, uint32_t fenceCount, const VkFence* pFences, VkBool32 waitAll, deUint64 timeout)
 {
        DE_UNREF(device);
        DE_UNREF(fenceCount);
@@ -661,7 +661,7 @@ VKAPI_ATTR VkResult VKAPI_CALL resetEvent (VkDevice device, VkEvent event)
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL getQueryPoolResults (VkDevice device, VkQueryPool queryPool, deUint32 firstQuery, deUint32 queryCount, deUintptr dataSize, void* pData, VkDeviceSize stride, VkQueryResultFlags flags)
+VKAPI_ATTR VkResult VKAPI_CALL getQueryPoolResults (VkDevice device, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount, deUintptr dataSize, void* pData, VkDeviceSize stride, VkQueryResultFlags flags)
 {
        DE_UNREF(device);
        DE_UNREF(queryPool);
@@ -691,7 +691,7 @@ VKAPI_ATTR VkResult VKAPI_CALL getPipelineCacheData (VkDevice device, VkPipeline
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL mergePipelineCaches (VkDevice device, VkPipelineCache dstCache, deUint32 srcCacheCount, const VkPipelineCache* pSrcCaches)
+VKAPI_ATTR VkResult VKAPI_CALL mergePipelineCaches (VkDevice device, VkPipelineCache dstCache, uint32_t srcCacheCount, const VkPipelineCache* pSrcCaches)
 {
        DE_UNREF(device);
        DE_UNREF(dstCache);
@@ -700,7 +700,7 @@ VKAPI_ATTR VkResult VKAPI_CALL mergePipelineCaches (VkDevice device, VkPipelineC
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR void VKAPI_CALL updateDescriptorSets (VkDevice device, deUint32 descriptorWriteCount, const VkWriteDescriptorSet* pDescriptorWrites, deUint32 descriptorCopyCount, const VkCopyDescriptorSet* pDescriptorCopies)
+VKAPI_ATTR void VKAPI_CALL updateDescriptorSets (VkDevice device, uint32_t descriptorWriteCount, const VkWriteDescriptorSet* pDescriptorWrites, uint32_t descriptorCopyCount, const VkCopyDescriptorSet* pDescriptorCopies)
 {
        DE_UNREF(device);
        DE_UNREF(descriptorWriteCount);
@@ -751,7 +751,7 @@ VKAPI_ATTR void VKAPI_CALL cmdBindPipeline (VkCommandBuffer commandBuffer, VkPip
        DE_UNREF(pipeline);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdSetViewport (VkCommandBuffer commandBuffer, deUint32 firstViewport, deUint32 viewportCount, const VkViewport* pViewports)
+VKAPI_ATTR void VKAPI_CALL cmdSetViewport (VkCommandBuffer commandBuffer, uint32_t firstViewport, uint32_t viewportCount, const VkViewport* pViewports)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(firstViewport);
@@ -759,7 +759,7 @@ VKAPI_ATTR void VKAPI_CALL cmdSetViewport (VkCommandBuffer commandBuffer, deUint
        DE_UNREF(pViewports);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdSetScissor (VkCommandBuffer commandBuffer, deUint32 firstScissor, deUint32 scissorCount, const VkRect2D* pScissors)
+VKAPI_ATTR void VKAPI_CALL cmdSetScissor (VkCommandBuffer commandBuffer, uint32_t firstScissor, uint32_t scissorCount, const VkRect2D* pScissors)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(firstScissor);
@@ -794,28 +794,28 @@ VKAPI_ATTR void VKAPI_CALL cmdSetDepthBounds (VkCommandBuffer commandBuffer, flo
        DE_UNREF(maxDepthBounds);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdSetStencilCompareMask (VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, deUint32 compareMask)
+VKAPI_ATTR void VKAPI_CALL cmdSetStencilCompareMask (VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t compareMask)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(faceMask);
        DE_UNREF(compareMask);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdSetStencilWriteMask (VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, deUint32 writeMask)
+VKAPI_ATTR void VKAPI_CALL cmdSetStencilWriteMask (VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t writeMask)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(faceMask);
        DE_UNREF(writeMask);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdSetStencilReference (VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, deUint32 reference)
+VKAPI_ATTR void VKAPI_CALL cmdSetStencilReference (VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t reference)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(faceMask);
        DE_UNREF(reference);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdBindDescriptorSets (VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, deUint32 firstSet, deUint32 descriptorSetCount, const VkDescriptorSet* pDescriptorSets, deUint32 dynamicOffsetCount, const deUint32* pDynamicOffsets)
+VKAPI_ATTR void VKAPI_CALL cmdBindDescriptorSets (VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, uint32_t firstSet, uint32_t descriptorSetCount, const VkDescriptorSet* pDescriptorSets, uint32_t dynamicOffsetCount, const uint32_t* pDynamicOffsets)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(pipelineBindPoint);
@@ -835,7 +835,7 @@ VKAPI_ATTR void VKAPI_CALL cmdBindIndexBuffer (VkCommandBuffer commandBuffer, Vk
        DE_UNREF(indexType);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdBindVertexBuffers (VkCommandBuffer commandBuffer, deUint32 firstBinding, deUint32 bindingCount, const VkBuffer* pBuffers, const VkDeviceSize* pOffsets)
+VKAPI_ATTR void VKAPI_CALL cmdBindVertexBuffers (VkCommandBuffer commandBuffer, uint32_t firstBinding, uint32_t bindingCount, const VkBuffer* pBuffers, const VkDeviceSize* pOffsets)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(firstBinding);
@@ -844,7 +844,7 @@ VKAPI_ATTR void VKAPI_CALL cmdBindVertexBuffers (VkCommandBuffer commandBuffer,
        DE_UNREF(pOffsets);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdDraw (VkCommandBuffer commandBuffer, deUint32 vertexCount, deUint32 instanceCount, deUint32 firstVertex, deUint32 firstInstance)
+VKAPI_ATTR void VKAPI_CALL cmdDraw (VkCommandBuffer commandBuffer, uint32_t vertexCount, uint32_t instanceCount, uint32_t firstVertex, uint32_t firstInstance)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(vertexCount);
@@ -853,7 +853,7 @@ VKAPI_ATTR void VKAPI_CALL cmdDraw (VkCommandBuffer commandBuffer, deUint32 vert
        DE_UNREF(firstInstance);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdDrawIndexed (VkCommandBuffer commandBuffer, deUint32 indexCount, deUint32 instanceCount, deUint32 firstIndex, deInt32 vertexOffset, deUint32 firstInstance)
+VKAPI_ATTR void VKAPI_CALL cmdDrawIndexed (VkCommandBuffer commandBuffer, uint32_t indexCount, uint32_t instanceCount, uint32_t firstIndex, int32_t vertexOffset, uint32_t firstInstance)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(indexCount);
@@ -863,7 +863,7 @@ VKAPI_ATTR void VKAPI_CALL cmdDrawIndexed (VkCommandBuffer commandBuffer, deUint
        DE_UNREF(firstInstance);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdDrawIndirect (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, deUint32 drawCount, deUint32 stride)
+VKAPI_ATTR void VKAPI_CALL cmdDrawIndirect (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(buffer);
@@ -872,7 +872,7 @@ VKAPI_ATTR void VKAPI_CALL cmdDrawIndirect (VkCommandBuffer commandBuffer, VkBuf
        DE_UNREF(stride);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdDrawIndexedIndirect (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, deUint32 drawCount, deUint32 stride)
+VKAPI_ATTR void VKAPI_CALL cmdDrawIndexedIndirect (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(buffer);
@@ -881,7 +881,7 @@ VKAPI_ATTR void VKAPI_CALL cmdDrawIndexedIndirect (VkCommandBuffer commandBuffer
        DE_UNREF(stride);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdDispatch (VkCommandBuffer commandBuffer, deUint32 groupCountX, deUint32 groupCountY, deUint32 groupCountZ)
+VKAPI_ATTR void VKAPI_CALL cmdDispatch (VkCommandBuffer commandBuffer, uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(groupCountX);
@@ -896,7 +896,7 @@ VKAPI_ATTR void VKAPI_CALL cmdDispatchIndirect (VkCommandBuffer commandBuffer, V
        DE_UNREF(offset);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdCopyBuffer (VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkBuffer dstBuffer, deUint32 regionCount, const VkBufferCopy* pRegions)
+VKAPI_ATTR void VKAPI_CALL cmdCopyBuffer (VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkBuffer dstBuffer, uint32_t regionCount, const VkBufferCopy* pRegions)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(srcBuffer);
@@ -905,7 +905,7 @@ VKAPI_ATTR void VKAPI_CALL cmdCopyBuffer (VkCommandBuffer commandBuffer, VkBuffe
        DE_UNREF(pRegions);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdCopyImage (VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, deUint32 regionCount, const VkImageCopy* pRegions)
+VKAPI_ATTR void VKAPI_CALL cmdCopyImage (VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageCopy* pRegions)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(srcImage);
@@ -916,7 +916,7 @@ VKAPI_ATTR void VKAPI_CALL cmdCopyImage (VkCommandBuffer commandBuffer, VkImage
        DE_UNREF(pRegions);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdBlitImage (VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, deUint32 regionCount, const VkImageBlit* pRegions, VkFilter filter)
+VKAPI_ATTR void VKAPI_CALL cmdBlitImage (VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageBlit* pRegions, VkFilter filter)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(srcImage);
@@ -928,7 +928,7 @@ VKAPI_ATTR void VKAPI_CALL cmdBlitImage (VkCommandBuffer commandBuffer, VkImage
        DE_UNREF(filter);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdCopyBufferToImage (VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkImage dstImage, VkImageLayout dstImageLayout, deUint32 regionCount, const VkBufferImageCopy* pRegions)
+VKAPI_ATTR void VKAPI_CALL cmdCopyBufferToImage (VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkBufferImageCopy* pRegions)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(srcBuffer);
@@ -938,7 +938,7 @@ VKAPI_ATTR void VKAPI_CALL cmdCopyBufferToImage (VkCommandBuffer commandBuffer,
        DE_UNREF(pRegions);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdCopyImageToBuffer (VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkBuffer dstBuffer, deUint32 regionCount, const VkBufferImageCopy* pRegions)
+VKAPI_ATTR void VKAPI_CALL cmdCopyImageToBuffer (VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkBuffer dstBuffer, uint32_t regionCount, const VkBufferImageCopy* pRegions)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(srcImage);
@@ -957,7 +957,7 @@ VKAPI_ATTR void VKAPI_CALL cmdUpdateBuffer (VkCommandBuffer commandBuffer, VkBuf
        DE_UNREF(pData);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdFillBuffer (VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize size, deUint32 data)
+VKAPI_ATTR void VKAPI_CALL cmdFillBuffer (VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize size, uint32_t data)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(dstBuffer);
@@ -966,7 +966,7 @@ VKAPI_ATTR void VKAPI_CALL cmdFillBuffer (VkCommandBuffer commandBuffer, VkBuffe
        DE_UNREF(data);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdClearColorImage (VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearColorValue* pColor, deUint32 rangeCount, const VkImageSubresourceRange* pRanges)
+VKAPI_ATTR void VKAPI_CALL cmdClearColorImage (VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearColorValue* pColor, uint32_t rangeCount, const VkImageSubresourceRange* pRanges)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(image);
@@ -976,7 +976,7 @@ VKAPI_ATTR void VKAPI_CALL cmdClearColorImage (VkCommandBuffer commandBuffer, Vk
        DE_UNREF(pRanges);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdClearDepthStencilImage (VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearDepthStencilValue* pDepthStencil, deUint32 rangeCount, const VkImageSubresourceRange* pRanges)
+VKAPI_ATTR void VKAPI_CALL cmdClearDepthStencilImage (VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearDepthStencilValue* pDepthStencil, uint32_t rangeCount, const VkImageSubresourceRange* pRanges)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(image);
@@ -986,7 +986,7 @@ VKAPI_ATTR void VKAPI_CALL cmdClearDepthStencilImage (VkCommandBuffer commandBuf
        DE_UNREF(pRanges);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdClearAttachments (VkCommandBuffer commandBuffer, deUint32 attachmentCount, const VkClearAttachment* pAttachments, deUint32 rectCount, const VkClearRect* pRects)
+VKAPI_ATTR void VKAPI_CALL cmdClearAttachments (VkCommandBuffer commandBuffer, uint32_t attachmentCount, const VkClearAttachment* pAttachments, uint32_t rectCount, const VkClearRect* pRects)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(attachmentCount);
@@ -995,7 +995,7 @@ VKAPI_ATTR void VKAPI_CALL cmdClearAttachments (VkCommandBuffer commandBuffer, d
        DE_UNREF(pRects);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdResolveImage (VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, deUint32 regionCount, const VkImageResolve* pRegions)
+VKAPI_ATTR void VKAPI_CALL cmdResolveImage (VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageResolve* pRegions)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(srcImage);
@@ -1020,7 +1020,7 @@ VKAPI_ATTR void VKAPI_CALL cmdResetEvent (VkCommandBuffer commandBuffer, VkEvent
        DE_UNREF(stageMask);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdWaitEvents (VkCommandBuffer commandBuffer, deUint32 eventCount, const VkEvent* pEvents, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, deUint32 memoryBarrierCount, const VkMemoryBarrier* pMemoryBarriers, deUint32 bufferMemoryBarrierCount, const VkBufferMemoryBarrier* pBufferMemoryBarriers, deUint32 imageMemoryBarrierCount, const VkImageMemoryBarrier* pImageMemoryBarriers)
+VKAPI_ATTR void VKAPI_CALL cmdWaitEvents (VkCommandBuffer commandBuffer, uint32_t eventCount, const VkEvent* pEvents, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, uint32_t memoryBarrierCount, const VkMemoryBarrier* pMemoryBarriers, uint32_t bufferMemoryBarrierCount, const VkBufferMemoryBarrier* pBufferMemoryBarriers, uint32_t imageMemoryBarrierCount, const VkImageMemoryBarrier* pImageMemoryBarriers)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(eventCount);
@@ -1035,7 +1035,7 @@ VKAPI_ATTR void VKAPI_CALL cmdWaitEvents (VkCommandBuffer commandBuffer, deUint3
        DE_UNREF(pImageMemoryBarriers);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdPipelineBarrier (VkCommandBuffer commandBuffer, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, VkDependencyFlags dependencyFlags, deUint32 memoryBarrierCount, const VkMemoryBarrier* pMemoryBarriers, deUint32 bufferMemoryBarrierCount, const VkBufferMemoryBarrier* pBufferMemoryBarriers, deUint32 imageMemoryBarrierCount, const VkImageMemoryBarrier* pImageMemoryBarriers)
+VKAPI_ATTR void VKAPI_CALL cmdPipelineBarrier (VkCommandBuffer commandBuffer, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, VkDependencyFlags dependencyFlags, uint32_t memoryBarrierCount, const VkMemoryBarrier* pMemoryBarriers, uint32_t bufferMemoryBarrierCount, const VkBufferMemoryBarrier* pBufferMemoryBarriers, uint32_t imageMemoryBarrierCount, const VkImageMemoryBarrier* pImageMemoryBarriers)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(srcStageMask);
@@ -1049,7 +1049,7 @@ VKAPI_ATTR void VKAPI_CALL cmdPipelineBarrier (VkCommandBuffer commandBuffer, Vk
        DE_UNREF(pImageMemoryBarriers);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdBeginQuery (VkCommandBuffer commandBuffer, VkQueryPool queryPool, deUint32 query, VkQueryControlFlags flags)
+VKAPI_ATTR void VKAPI_CALL cmdBeginQuery (VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query, VkQueryControlFlags flags)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(queryPool);
@@ -1057,14 +1057,14 @@ VKAPI_ATTR void VKAPI_CALL cmdBeginQuery (VkCommandBuffer commandBuffer, VkQuery
        DE_UNREF(flags);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdEndQuery (VkCommandBuffer commandBuffer, VkQueryPool queryPool, deUint32 query)
+VKAPI_ATTR void VKAPI_CALL cmdEndQuery (VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(queryPool);
        DE_UNREF(query);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdResetQueryPool (VkCommandBuffer commandBuffer, VkQueryPool queryPool, deUint32 firstQuery, deUint32 queryCount)
+VKAPI_ATTR void VKAPI_CALL cmdResetQueryPool (VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(queryPool);
@@ -1072,7 +1072,7 @@ VKAPI_ATTR void VKAPI_CALL cmdResetQueryPool (VkCommandBuffer commandBuffer, VkQ
        DE_UNREF(queryCount);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdWriteTimestamp (VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkQueryPool queryPool, deUint32 query)
+VKAPI_ATTR void VKAPI_CALL cmdWriteTimestamp (VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkQueryPool queryPool, uint32_t query)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(pipelineStage);
@@ -1080,7 +1080,7 @@ VKAPI_ATTR void VKAPI_CALL cmdWriteTimestamp (VkCommandBuffer commandBuffer, VkP
        DE_UNREF(query);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdCopyQueryPoolResults (VkCommandBuffer commandBuffer, VkQueryPool queryPool, deUint32 firstQuery, deUint32 queryCount, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize stride, VkQueryResultFlags flags)
+VKAPI_ATTR void VKAPI_CALL cmdCopyQueryPoolResults (VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize stride, VkQueryResultFlags flags)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(queryPool);
@@ -1092,7 +1092,7 @@ VKAPI_ATTR void VKAPI_CALL cmdCopyQueryPoolResults (VkCommandBuffer commandBuffe
        DE_UNREF(flags);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdPushConstants (VkCommandBuffer commandBuffer, VkPipelineLayout layout, VkShaderStageFlags stageFlags, deUint32 offset, deUint32 size, const void* pValues)
+VKAPI_ATTR void VKAPI_CALL cmdPushConstants (VkCommandBuffer commandBuffer, VkPipelineLayout layout, VkShaderStageFlags stageFlags, uint32_t offset, uint32_t size, const void* pValues)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(layout);
@@ -1120,20 +1120,20 @@ VKAPI_ATTR void VKAPI_CALL cmdEndRenderPass (VkCommandBuffer commandBuffer)
        DE_UNREF(commandBuffer);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdExecuteCommands (VkCommandBuffer commandBuffer, deUint32 commandBufferCount, const VkCommandBuffer* pCommandBuffers)
+VKAPI_ATTR void VKAPI_CALL cmdExecuteCommands (VkCommandBuffer commandBuffer, uint32_t commandBufferCount, const VkCommandBuffer* pCommandBuffers)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(commandBufferCount);
        DE_UNREF(pCommandBuffers);
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL enumerateInstanceVersion (deUint32* pApiVersion)
+VKAPI_ATTR VkResult VKAPI_CALL enumerateInstanceVersion (uint32_t* pApiVersion)
 {
        DE_UNREF(pApiVersion);
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL bindBufferMemory2 (VkDevice device, deUint32 bindInfoCount, const VkBindBufferMemoryInfo* pBindInfos)
+VKAPI_ATTR VkResult VKAPI_CALL bindBufferMemory2 (VkDevice device, uint32_t bindInfoCount, const VkBindBufferMemoryInfo* pBindInfos)
 {
        DE_UNREF(device);
        DE_UNREF(bindInfoCount);
@@ -1141,7 +1141,7 @@ VKAPI_ATTR VkResult VKAPI_CALL bindBufferMemory2 (VkDevice device, deUint32 bind
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL bindImageMemory2 (VkDevice device, deUint32 bindInfoCount, const VkBindImageMemoryInfo* pBindInfos)
+VKAPI_ATTR VkResult VKAPI_CALL bindImageMemory2 (VkDevice device, uint32_t bindInfoCount, const VkBindImageMemoryInfo* pBindInfos)
 {
        DE_UNREF(device);
        DE_UNREF(bindInfoCount);
@@ -1149,7 +1149,7 @@ VKAPI_ATTR VkResult VKAPI_CALL bindImageMemory2 (VkDevice device, deUint32 bindI
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR void VKAPI_CALL getDeviceGroupPeerMemoryFeatures (VkDevice device, deUint32 heapIndex, deUint32 localDeviceIndex, deUint32 remoteDeviceIndex, VkPeerMemoryFeatureFlags* pPeerMemoryFeatures)
+VKAPI_ATTR void VKAPI_CALL getDeviceGroupPeerMemoryFeatures (VkDevice device, uint32_t heapIndex, uint32_t localDeviceIndex, uint32_t remoteDeviceIndex, VkPeerMemoryFeatureFlags* pPeerMemoryFeatures)
 {
        DE_UNREF(device);
        DE_UNREF(heapIndex);
@@ -1158,13 +1158,13 @@ VKAPI_ATTR void VKAPI_CALL getDeviceGroupPeerMemoryFeatures (VkDevice device, de
        DE_UNREF(pPeerMemoryFeatures);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdSetDeviceMask (VkCommandBuffer commandBuffer, deUint32 deviceMask)
+VKAPI_ATTR void VKAPI_CALL cmdSetDeviceMask (VkCommandBuffer commandBuffer, uint32_t deviceMask)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(deviceMask);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdDispatchBase (VkCommandBuffer commandBuffer, deUint32 baseGroupX, deUint32 baseGroupY, deUint32 baseGroupZ, deUint32 groupCountX, deUint32 groupCountY, deUint32 groupCountZ)
+VKAPI_ATTR void VKAPI_CALL cmdDispatchBase (VkCommandBuffer commandBuffer, uint32_t baseGroupX, uint32_t baseGroupY, uint32_t baseGroupZ, uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(baseGroupX);
@@ -1175,7 +1175,7 @@ VKAPI_ATTR void VKAPI_CALL cmdDispatchBase (VkCommandBuffer commandBuffer, deUin
        DE_UNREF(groupCountZ);
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL enumeratePhysicalDeviceGroups (VkInstance instance, deUint32* pPhysicalDeviceGroupCount, VkPhysicalDeviceGroupProperties* pPhysicalDeviceGroupProperties)
+VKAPI_ATTR VkResult VKAPI_CALL enumeratePhysicalDeviceGroups (VkInstance instance, uint32_t* pPhysicalDeviceGroupCount, VkPhysicalDeviceGroupProperties* pPhysicalDeviceGroupProperties)
 {
        DE_UNREF(instance);
        DE_UNREF(pPhysicalDeviceGroupCount);
@@ -1197,7 +1197,7 @@ VKAPI_ATTR void VKAPI_CALL getBufferMemoryRequirements2 (VkDevice device, const
        DE_UNREF(pMemoryRequirements);
 }
 
-VKAPI_ATTR void VKAPI_CALL getImageSparseMemoryRequirements2 (VkDevice device, const VkImageSparseMemoryRequirementsInfo2* pInfo, deUint32* pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements2* pSparseMemoryRequirements)
+VKAPI_ATTR void VKAPI_CALL getImageSparseMemoryRequirements2 (VkDevice device, const VkImageSparseMemoryRequirementsInfo2* pInfo, uint32_t* pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements2* pSparseMemoryRequirements)
 {
        DE_UNREF(device);
        DE_UNREF(pInfo);
@@ -1232,7 +1232,7 @@ VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDeviceImageFormatProperties2 (VkPhysic
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR void VKAPI_CALL getPhysicalDeviceQueueFamilyProperties2 (VkPhysicalDevice physicalDevice, deUint32* pQueueFamilyPropertyCount, VkQueueFamilyProperties2* pQueueFamilyProperties)
+VKAPI_ATTR void VKAPI_CALL getPhysicalDeviceQueueFamilyProperties2 (VkPhysicalDevice physicalDevice, uint32_t* pQueueFamilyPropertyCount, VkQueueFamilyProperties2* pQueueFamilyProperties)
 {
        DE_UNREF(physicalDevice);
        DE_UNREF(pQueueFamilyPropertyCount);
@@ -1245,7 +1245,7 @@ VKAPI_ATTR void VKAPI_CALL getPhysicalDeviceMemoryProperties2 (VkPhysicalDevice
        DE_UNREF(pMemoryProperties);
 }
 
-VKAPI_ATTR void VKAPI_CALL getPhysicalDeviceSparseImageFormatProperties2 (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSparseImageFormatInfo2* pFormatInfo, deUint32* pPropertyCount, VkSparseImageFormatProperties2* pProperties)
+VKAPI_ATTR void VKAPI_CALL getPhysicalDeviceSparseImageFormatProperties2 (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSparseImageFormatInfo2* pFormatInfo, uint32_t* pPropertyCount, VkSparseImageFormatProperties2* pProperties)
 {
        DE_UNREF(physicalDevice);
        DE_UNREF(pFormatInfo);
@@ -1303,7 +1303,7 @@ VKAPI_ATTR void VKAPI_CALL getDescriptorSetLayoutSupport (VkDevice device, const
        DE_UNREF(pSupport);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdDrawIndirectCount (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, deUint32 maxDrawCount, deUint32 stride)
+VKAPI_ATTR void VKAPI_CALL cmdDrawIndirectCount (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(buffer);
@@ -1314,7 +1314,7 @@ VKAPI_ATTR void VKAPI_CALL cmdDrawIndirectCount (VkCommandBuffer commandBuffer,
        DE_UNREF(stride);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdDrawIndexedIndirectCount (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, deUint32 maxDrawCount, deUint32 stride)
+VKAPI_ATTR void VKAPI_CALL cmdDrawIndexedIndirectCount (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(buffer);
@@ -1345,7 +1345,7 @@ VKAPI_ATTR void VKAPI_CALL cmdEndRenderPass2 (VkCommandBuffer commandBuffer, con
        DE_UNREF(pSubpassEndInfo);
 }
 
-VKAPI_ATTR void VKAPI_CALL resetQueryPool (VkDevice device, VkQueryPool queryPool, deUint32 firstQuery, deUint32 queryCount)
+VKAPI_ATTR void VKAPI_CALL resetQueryPool (VkDevice device, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount)
 {
        DE_UNREF(device);
        DE_UNREF(queryPool);
@@ -1397,7 +1397,7 @@ VKAPI_ATTR uint64_t VKAPI_CALL getDeviceMemoryOpaqueCaptureAddress (VkDevice dev
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDeviceSurfaceSupportKHR (VkPhysicalDevice physicalDevice, deUint32 queueFamilyIndex, VkSurfaceKHR surface, VkBool32* pSupported)
+VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDeviceSurfaceSupportKHR (VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, VkSurfaceKHR surface, VkBool32* pSupported)
 {
        DE_UNREF(physicalDevice);
        DE_UNREF(queueFamilyIndex);
@@ -1414,7 +1414,7 @@ VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDeviceSurfaceCapabilitiesKHR (VkPhysic
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDeviceSurfaceFormatsKHR (VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, deUint32* pSurfaceFormatCount, VkSurfaceFormatKHR* pSurfaceFormats)
+VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDeviceSurfaceFormatsKHR (VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, uint32_t* pSurfaceFormatCount, VkSurfaceFormatKHR* pSurfaceFormats)
 {
        DE_UNREF(physicalDevice);
        DE_UNREF(surface);
@@ -1423,7 +1423,7 @@ VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDeviceSurfaceFormatsKHR (VkPhysicalDev
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDeviceSurfacePresentModesKHR (VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, deUint32* pPresentModeCount, VkPresentModeKHR* pPresentModes)
+VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDeviceSurfacePresentModesKHR (VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, uint32_t* pPresentModeCount, VkPresentModeKHR* pPresentModes)
 {
        DE_UNREF(physicalDevice);
        DE_UNREF(surface);
@@ -1432,7 +1432,7 @@ VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDeviceSurfacePresentModesKHR (VkPhysic
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL getSwapchainImagesKHR (VkDevice device, VkSwapchainKHR swapchain, deUint32* pSwapchainImageCount, VkImage* pSwapchainImages)
+VKAPI_ATTR VkResult VKAPI_CALL getSwapchainImagesKHR (VkDevice device, VkSwapchainKHR swapchain, uint32_t* pSwapchainImageCount, VkImage* pSwapchainImages)
 {
        DE_UNREF(device);
        DE_UNREF(swapchain);
@@ -1441,7 +1441,7 @@ VKAPI_ATTR VkResult VKAPI_CALL getSwapchainImagesKHR (VkDevice device, VkSwapcha
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL acquireNextImageKHR (VkDevice device, VkSwapchainKHR swapchain, deUint64 timeout, VkSemaphore semaphore, VkFence fence, deUint32* pImageIndex)
+VKAPI_ATTR VkResult VKAPI_CALL acquireNextImageKHR (VkDevice device, VkSwapchainKHR swapchain, deUint64 timeout, VkSemaphore semaphore, VkFence fence, uint32_t* pImageIndex)
 {
        DE_UNREF(device);
        DE_UNREF(swapchain);
@@ -1474,7 +1474,7 @@ VKAPI_ATTR VkResult VKAPI_CALL getDeviceGroupSurfacePresentModesKHR (VkDevice de
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDevicePresentRectanglesKHR (VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, deUint32* pRectCount, VkRect2D* pRects)
+VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDevicePresentRectanglesKHR (VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, uint32_t* pRectCount, VkRect2D* pRects)
 {
        DE_UNREF(physicalDevice);
        DE_UNREF(surface);
@@ -1483,7 +1483,7 @@ VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDevicePresentRectanglesKHR (VkPhysical
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL acquireNextImage2KHR (VkDevice device, const VkAcquireNextImageInfoKHR* pAcquireInfo, deUint32* pImageIndex)
+VKAPI_ATTR VkResult VKAPI_CALL acquireNextImage2KHR (VkDevice device, const VkAcquireNextImageInfoKHR* pAcquireInfo, uint32_t* pImageIndex)
 {
        DE_UNREF(device);
        DE_UNREF(pAcquireInfo);
@@ -1491,7 +1491,7 @@ VKAPI_ATTR VkResult VKAPI_CALL acquireNextImage2KHR (VkDevice device, const VkAc
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDeviceDisplayPropertiesKHR (VkPhysicalDevice physicalDevice, deUint32* pPropertyCount, VkDisplayPropertiesKHR* pProperties)
+VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDeviceDisplayPropertiesKHR (VkPhysicalDevice physicalDevice, uint32_t* pPropertyCount, VkDisplayPropertiesKHR* pProperties)
 {
        DE_UNREF(physicalDevice);
        DE_UNREF(pPropertyCount);
@@ -1499,7 +1499,7 @@ VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDeviceDisplayPropertiesKHR (VkPhysical
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDeviceDisplayPlanePropertiesKHR (VkPhysicalDevice physicalDevice, deUint32* pPropertyCount, VkDisplayPlanePropertiesKHR* pProperties)
+VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDeviceDisplayPlanePropertiesKHR (VkPhysicalDevice physicalDevice, uint32_t* pPropertyCount, VkDisplayPlanePropertiesKHR* pProperties)
 {
        DE_UNREF(physicalDevice);
        DE_UNREF(pPropertyCount);
@@ -1507,7 +1507,7 @@ VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDeviceDisplayPlanePropertiesKHR (VkPhy
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL getDisplayPlaneSupportedDisplaysKHR (VkPhysicalDevice physicalDevice, deUint32 planeIndex, deUint32* pDisplayCount, VkDisplayKHR* pDisplays)
+VKAPI_ATTR VkResult VKAPI_CALL getDisplayPlaneSupportedDisplaysKHR (VkPhysicalDevice physicalDevice, uint32_t planeIndex, uint32_t* pDisplayCount, VkDisplayKHR* pDisplays)
 {
        DE_UNREF(physicalDevice);
        DE_UNREF(planeIndex);
@@ -1516,7 +1516,7 @@ VKAPI_ATTR VkResult VKAPI_CALL getDisplayPlaneSupportedDisplaysKHR (VkPhysicalDe
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL getDisplayModePropertiesKHR (VkPhysicalDevice physicalDevice, VkDisplayKHR display, deUint32* pPropertyCount, VkDisplayModePropertiesKHR* pProperties)
+VKAPI_ATTR VkResult VKAPI_CALL getDisplayModePropertiesKHR (VkPhysicalDevice physicalDevice, VkDisplayKHR display, uint32_t* pPropertyCount, VkDisplayModePropertiesKHR* pProperties)
 {
        DE_UNREF(physicalDevice);
        DE_UNREF(display);
@@ -1525,7 +1525,7 @@ VKAPI_ATTR VkResult VKAPI_CALL getDisplayModePropertiesKHR (VkPhysicalDevice phy
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL getDisplayPlaneCapabilitiesKHR (VkPhysicalDevice physicalDevice, VkDisplayModeKHR mode, deUint32 planeIndex, VkDisplayPlaneCapabilitiesKHR* pCapabilities)
+VKAPI_ATTR VkResult VKAPI_CALL getDisplayPlaneCapabilitiesKHR (VkPhysicalDevice physicalDevice, VkDisplayModeKHR mode, uint32_t planeIndex, VkDisplayPlaneCapabilitiesKHR* pCapabilities)
 {
        DE_UNREF(physicalDevice);
        DE_UNREF(mode);
@@ -1566,7 +1566,7 @@ VKAPI_ATTR VkResult VKAPI_CALL getSemaphoreFdKHR (VkDevice device, const VkSemap
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdPushDescriptorSetKHR (VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, deUint32 set, deUint32 descriptorWriteCount, const VkWriteDescriptorSet* pDescriptorWrites)
+VKAPI_ATTR void VKAPI_CALL cmdPushDescriptorSetKHR (VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, uint32_t set, uint32_t descriptorWriteCount, const VkWriteDescriptorSet* pDescriptorWrites)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(pipelineBindPoint);
@@ -1576,7 +1576,7 @@ VKAPI_ATTR void VKAPI_CALL cmdPushDescriptorSetKHR (VkCommandBuffer commandBuffe
        DE_UNREF(pDescriptorWrites);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdPushDescriptorSetWithTemplateKHR (VkCommandBuffer commandBuffer, VkDescriptorUpdateTemplate descriptorUpdateTemplate, VkPipelineLayout layout, deUint32 set, const void* pData)
+VKAPI_ATTR void VKAPI_CALL cmdPushDescriptorSetWithTemplateKHR (VkCommandBuffer commandBuffer, VkDescriptorUpdateTemplate descriptorUpdateTemplate, VkPipelineLayout layout, uint32_t set, const void* pData)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(descriptorUpdateTemplate);
@@ -1607,7 +1607,7 @@ VKAPI_ATTR VkResult VKAPI_CALL getFenceFdKHR (VkDevice device, const VkFenceGetF
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL enumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR (VkPhysicalDevice physicalDevice, deUint32 queueFamilyIndex, deUint32* pCounterCount, VkPerformanceCounterKHR* pCounters, VkPerformanceCounterDescriptionKHR* pCounterDescriptions)
+VKAPI_ATTR VkResult VKAPI_CALL enumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR (VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, uint32_t* pCounterCount, VkPerformanceCounterKHR* pCounters, VkPerformanceCounterDescriptionKHR* pCounterDescriptions)
 {
        DE_UNREF(physicalDevice);
        DE_UNREF(queueFamilyIndex);
@@ -1617,7 +1617,7 @@ VKAPI_ATTR VkResult VKAPI_CALL enumeratePhysicalDeviceQueueFamilyPerformanceQuer
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR void VKAPI_CALL getPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR (VkPhysicalDevice physicalDevice, const VkQueryPoolPerformanceCreateInfoKHR* pPerformanceQueryCreateInfo, deUint32* pNumPasses)
+VKAPI_ATTR void VKAPI_CALL getPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR (VkPhysicalDevice physicalDevice, const VkQueryPoolPerformanceCreateInfoKHR* pPerformanceQueryCreateInfo, uint32_t* pNumPasses)
 {
        DE_UNREF(physicalDevice);
        DE_UNREF(pPerformanceQueryCreateInfo);
@@ -1644,7 +1644,7 @@ VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDeviceSurfaceCapabilities2KHR (VkPhysi
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDeviceSurfaceFormats2KHR (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo, deUint32* pSurfaceFormatCount, VkSurfaceFormat2KHR* pSurfaceFormats)
+VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDeviceSurfaceFormats2KHR (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo, uint32_t* pSurfaceFormatCount, VkSurfaceFormat2KHR* pSurfaceFormats)
 {
        DE_UNREF(physicalDevice);
        DE_UNREF(pSurfaceInfo);
@@ -1653,7 +1653,7 @@ VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDeviceSurfaceFormats2KHR (VkPhysicalDe
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDeviceDisplayProperties2KHR (VkPhysicalDevice physicalDevice, deUint32* pPropertyCount, VkDisplayProperties2KHR* pProperties)
+VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDeviceDisplayProperties2KHR (VkPhysicalDevice physicalDevice, uint32_t* pPropertyCount, VkDisplayProperties2KHR* pProperties)
 {
        DE_UNREF(physicalDevice);
        DE_UNREF(pPropertyCount);
@@ -1661,7 +1661,7 @@ VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDeviceDisplayProperties2KHR (VkPhysica
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDeviceDisplayPlaneProperties2KHR (VkPhysicalDevice physicalDevice, deUint32* pPropertyCount, VkDisplayPlaneProperties2KHR* pProperties)
+VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDeviceDisplayPlaneProperties2KHR (VkPhysicalDevice physicalDevice, uint32_t* pPropertyCount, VkDisplayPlaneProperties2KHR* pProperties)
 {
        DE_UNREF(physicalDevice);
        DE_UNREF(pPropertyCount);
@@ -1669,7 +1669,7 @@ VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDeviceDisplayPlaneProperties2KHR (VkPh
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL getDisplayModeProperties2KHR (VkPhysicalDevice physicalDevice, VkDisplayKHR display, deUint32* pPropertyCount, VkDisplayModeProperties2KHR* pProperties)
+VKAPI_ATTR VkResult VKAPI_CALL getDisplayModeProperties2KHR (VkPhysicalDevice physicalDevice, VkDisplayKHR display, uint32_t* pPropertyCount, VkDisplayModeProperties2KHR* pProperties)
 {
        DE_UNREF(physicalDevice);
        DE_UNREF(display);
@@ -1686,7 +1686,7 @@ VKAPI_ATTR VkResult VKAPI_CALL getDisplayPlaneCapabilities2KHR (VkPhysicalDevice
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDeviceFragmentShadingRatesKHR (VkPhysicalDevice physicalDevice, deUint32* pFragmentShadingRateCount, VkPhysicalDeviceFragmentShadingRateKHR* pFragmentShadingRates)
+VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDeviceFragmentShadingRatesKHR (VkPhysicalDevice physicalDevice, uint32_t* pFragmentShadingRateCount, VkPhysicalDeviceFragmentShadingRateKHR* pFragmentShadingRates)
 {
        DE_UNREF(physicalDevice);
        DE_UNREF(pFragmentShadingRateCount);
@@ -1722,7 +1722,7 @@ VKAPI_ATTR VkResult VKAPI_CALL deferredOperationJoinKHR (VkDevice device, VkDefe
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL getPipelineExecutablePropertiesKHR (VkDevice device, const VkPipelineInfoKHR* pPipelineInfo, deUint32* pExecutableCount, VkPipelineExecutablePropertiesKHR* pProperties)
+VKAPI_ATTR VkResult VKAPI_CALL getPipelineExecutablePropertiesKHR (VkDevice device, const VkPipelineInfoKHR* pPipelineInfo, uint32_t* pExecutableCount, VkPipelineExecutablePropertiesKHR* pProperties)
 {
        DE_UNREF(device);
        DE_UNREF(pPipelineInfo);
@@ -1731,7 +1731,7 @@ VKAPI_ATTR VkResult VKAPI_CALL getPipelineExecutablePropertiesKHR (VkDevice devi
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL getPipelineExecutableStatisticsKHR (VkDevice device, const VkPipelineExecutableInfoKHR* pExecutableInfo, deUint32* pStatisticCount, VkPipelineExecutableStatisticKHR* pStatistics)
+VKAPI_ATTR VkResult VKAPI_CALL getPipelineExecutableStatisticsKHR (VkDevice device, const VkPipelineExecutableInfoKHR* pExecutableInfo, uint32_t* pStatisticCount, VkPipelineExecutableStatisticKHR* pStatistics)
 {
        DE_UNREF(device);
        DE_UNREF(pExecutableInfo);
@@ -1740,7 +1740,7 @@ VKAPI_ATTR VkResult VKAPI_CALL getPipelineExecutableStatisticsKHR (VkDevice devi
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL getPipelineExecutableInternalRepresentationsKHR (VkDevice device, const VkPipelineExecutableInfoKHR* pExecutableInfo, deUint32* pInternalRepresentationCount, VkPipelineExecutableInternalRepresentationKHR* pInternalRepresentations)
+VKAPI_ATTR VkResult VKAPI_CALL getPipelineExecutableInternalRepresentationsKHR (VkDevice device, const VkPipelineExecutableInfoKHR* pExecutableInfo, uint32_t* pInternalRepresentationCount, VkPipelineExecutableInternalRepresentationKHR* pInternalRepresentations)
 {
        DE_UNREF(device);
        DE_UNREF(pExecutableInfo);
@@ -1763,7 +1763,7 @@ VKAPI_ATTR void VKAPI_CALL cmdResetEvent2KHR (VkCommandBuffer commandBuffer, VkE
        DE_UNREF(stageMask);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdWaitEvents2KHR (VkCommandBuffer commandBuffer, deUint32 eventCount, const VkEvent* pEvents, const VkDependencyInfoKHR* pDependencyInfos)
+VKAPI_ATTR void VKAPI_CALL cmdWaitEvents2KHR (VkCommandBuffer commandBuffer, uint32_t eventCount, const VkEvent* pEvents, const VkDependencyInfoKHR* pDependencyInfos)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(eventCount);
@@ -1777,7 +1777,7 @@ VKAPI_ATTR void VKAPI_CALL cmdPipelineBarrier2KHR (VkCommandBuffer commandBuffer
        DE_UNREF(pDependencyInfo);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdWriteTimestamp2KHR (VkCommandBuffer commandBuffer, VkPipelineStageFlags2KHR stage, VkQueryPool queryPool, deUint32 query)
+VKAPI_ATTR void VKAPI_CALL cmdWriteTimestamp2KHR (VkCommandBuffer commandBuffer, VkPipelineStageFlags2KHR stage, VkQueryPool queryPool, uint32_t query)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(stage);
@@ -1785,7 +1785,7 @@ VKAPI_ATTR void VKAPI_CALL cmdWriteTimestamp2KHR (VkCommandBuffer commandBuffer,
        DE_UNREF(query);
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL queueSubmit2KHR (VkQueue queue, deUint32 submitCount, const VkSubmitInfo2KHR* pSubmits, VkFence fence)
+VKAPI_ATTR VkResult VKAPI_CALL queueSubmit2KHR (VkQueue queue, uint32_t submitCount, const VkSubmitInfo2KHR* pSubmits, VkFence fence)
 {
        DE_UNREF(queue);
        DE_UNREF(submitCount);
@@ -1794,7 +1794,7 @@ VKAPI_ATTR VkResult VKAPI_CALL queueSubmit2KHR (VkQueue queue, deUint32 submitCo
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdWriteBufferMarker2AMD (VkCommandBuffer commandBuffer, VkPipelineStageFlags2KHR stage, VkBuffer dstBuffer, VkDeviceSize dstOffset, deUint32 marker)
+VKAPI_ATTR void VKAPI_CALL cmdWriteBufferMarker2AMD (VkCommandBuffer commandBuffer, VkPipelineStageFlags2KHR stage, VkBuffer dstBuffer, VkDeviceSize dstOffset, uint32_t marker)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(stage);
@@ -1803,7 +1803,7 @@ VKAPI_ATTR void VKAPI_CALL cmdWriteBufferMarker2AMD (VkCommandBuffer commandBuff
        DE_UNREF(marker);
 }
 
-VKAPI_ATTR void VKAPI_CALL getQueueCheckpointData2NV (VkQueue queue, deUint32* pCheckpointDataCount, VkCheckpointData2NV* pCheckpointData)
+VKAPI_ATTR void VKAPI_CALL getQueueCheckpointData2NV (VkQueue queue, uint32_t* pCheckpointDataCount, VkCheckpointData2NV* pCheckpointData)
 {
        DE_UNREF(queue);
        DE_UNREF(pCheckpointDataCount);
@@ -1846,7 +1846,7 @@ VKAPI_ATTR void VKAPI_CALL cmdResolveImage2KHR (VkCommandBuffer commandBuffer, c
        DE_UNREF(pResolveImageInfo);
 }
 
-VKAPI_ATTR void VKAPI_CALL debugReportMessageEXT (VkInstance instance, VkDebugReportFlagsEXT flags, VkDebugReportObjectTypeEXT objectType, deUint64 object, deUintptr location, deInt32 messageCode, const char* pLayerPrefix, const char* pMessage)
+VKAPI_ATTR void VKAPI_CALL debugReportMessageEXT (VkInstance instance, VkDebugReportFlagsEXT flags, VkDebugReportObjectTypeEXT objectType, deUint64 object, deUintptr location, int32_t messageCode, const char* pLayerPrefix, const char* pMessage)
 {
        DE_UNREF(instance);
        DE_UNREF(flags);
@@ -1889,7 +1889,7 @@ VKAPI_ATTR void VKAPI_CALL cmdDebugMarkerInsertEXT (VkCommandBuffer commandBuffe
        DE_UNREF(pMarkerInfo);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdBindTransformFeedbackBuffersEXT (VkCommandBuffer commandBuffer, deUint32 firstBinding, deUint32 bindingCount, const VkBuffer* pBuffers, const VkDeviceSize* pOffsets, const VkDeviceSize* pSizes)
+VKAPI_ATTR void VKAPI_CALL cmdBindTransformFeedbackBuffersEXT (VkCommandBuffer commandBuffer, uint32_t firstBinding, uint32_t bindingCount, const VkBuffer* pBuffers, const VkDeviceSize* pOffsets, const VkDeviceSize* pSizes)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(firstBinding);
@@ -1899,7 +1899,7 @@ VKAPI_ATTR void VKAPI_CALL cmdBindTransformFeedbackBuffersEXT (VkCommandBuffer c
        DE_UNREF(pSizes);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdBeginTransformFeedbackEXT (VkCommandBuffer commandBuffer, deUint32 firstCounterBuffer, deUint32 counterBufferCount, const VkBuffer* pCounterBuffers, const VkDeviceSize* pCounterBufferOffsets)
+VKAPI_ATTR void VKAPI_CALL cmdBeginTransformFeedbackEXT (VkCommandBuffer commandBuffer, uint32_t firstCounterBuffer, uint32_t counterBufferCount, const VkBuffer* pCounterBuffers, const VkDeviceSize* pCounterBufferOffsets)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(firstCounterBuffer);
@@ -1908,7 +1908,7 @@ VKAPI_ATTR void VKAPI_CALL cmdBeginTransformFeedbackEXT (VkCommandBuffer command
        DE_UNREF(pCounterBufferOffsets);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdEndTransformFeedbackEXT (VkCommandBuffer commandBuffer, deUint32 firstCounterBuffer, deUint32 counterBufferCount, const VkBuffer* pCounterBuffers, const VkDeviceSize* pCounterBufferOffsets)
+VKAPI_ATTR void VKAPI_CALL cmdEndTransformFeedbackEXT (VkCommandBuffer commandBuffer, uint32_t firstCounterBuffer, uint32_t counterBufferCount, const VkBuffer* pCounterBuffers, const VkDeviceSize* pCounterBufferOffsets)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(firstCounterBuffer);
@@ -1917,7 +1917,7 @@ VKAPI_ATTR void VKAPI_CALL cmdEndTransformFeedbackEXT (VkCommandBuffer commandBu
        DE_UNREF(pCounterBufferOffsets);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdBeginQueryIndexedEXT (VkCommandBuffer commandBuffer, VkQueryPool queryPool, deUint32 query, VkQueryControlFlags flags, deUint32 index)
+VKAPI_ATTR void VKAPI_CALL cmdBeginQueryIndexedEXT (VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query, VkQueryControlFlags flags, uint32_t index)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(queryPool);
@@ -1926,7 +1926,7 @@ VKAPI_ATTR void VKAPI_CALL cmdBeginQueryIndexedEXT (VkCommandBuffer commandBuffe
        DE_UNREF(index);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdEndQueryIndexedEXT (VkCommandBuffer commandBuffer, VkQueryPool queryPool, deUint32 query, deUint32 index)
+VKAPI_ATTR void VKAPI_CALL cmdEndQueryIndexedEXT (VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query, uint32_t index)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(queryPool);
@@ -1934,7 +1934,7 @@ VKAPI_ATTR void VKAPI_CALL cmdEndQueryIndexedEXT (VkCommandBuffer commandBuffer,
        DE_UNREF(index);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdDrawIndirectByteCountEXT (VkCommandBuffer commandBuffer, deUint32 instanceCount, deUint32 firstInstance, VkBuffer counterBuffer, VkDeviceSize counterBufferOffset, deUint32 counterOffset, deUint32 vertexStride)
+VKAPI_ATTR void VKAPI_CALL cmdDrawIndirectByteCountEXT (VkCommandBuffer commandBuffer, uint32_t instanceCount, uint32_t firstInstance, VkBuffer counterBuffer, VkDeviceSize counterBufferOffset, uint32_t counterOffset, uint32_t vertexStride)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(instanceCount);
@@ -1966,7 +1966,7 @@ VKAPI_ATTR VkResult VKAPI_CALL getImageViewAddressNVX (VkDevice device, VkImageV
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdDrawIndirectCountAMD (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, deUint32 maxDrawCount, deUint32 stride)
+VKAPI_ATTR void VKAPI_CALL cmdDrawIndirectCountAMD (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(buffer);
@@ -1977,7 +1977,7 @@ VKAPI_ATTR void VKAPI_CALL cmdDrawIndirectCountAMD (VkCommandBuffer commandBuffe
        DE_UNREF(stride);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdDrawIndexedIndirectCountAMD (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, deUint32 maxDrawCount, deUint32 stride)
+VKAPI_ATTR void VKAPI_CALL cmdDrawIndexedIndirectCountAMD (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(buffer);
@@ -2023,7 +2023,7 @@ VKAPI_ATTR void VKAPI_CALL cmdEndConditionalRenderingEXT (VkCommandBuffer comman
        DE_UNREF(commandBuffer);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdSetViewportWScalingNV (VkCommandBuffer commandBuffer, deUint32 firstViewport, deUint32 viewportCount, const VkViewportWScalingNV* pViewportWScalings)
+VKAPI_ATTR void VKAPI_CALL cmdSetViewportWScalingNV (VkCommandBuffer commandBuffer, uint32_t firstViewport, uint32_t viewportCount, const VkViewportWScalingNV* pViewportWScalings)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(firstViewport);
@@ -2090,7 +2090,7 @@ VKAPI_ATTR VkResult VKAPI_CALL getRefreshCycleDurationGOOGLE (VkDevice device, V
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL getPastPresentationTimingGOOGLE (VkDevice device, VkSwapchainKHR swapchain, deUint32* pPresentationTimingCount, VkPastPresentationTimingGOOGLE* pPresentationTimings)
+VKAPI_ATTR VkResult VKAPI_CALL getPastPresentationTimingGOOGLE (VkDevice device, VkSwapchainKHR swapchain, uint32_t* pPresentationTimingCount, VkPastPresentationTimingGOOGLE* pPresentationTimings)
 {
        DE_UNREF(device);
        DE_UNREF(swapchain);
@@ -2099,7 +2099,7 @@ VKAPI_ATTR VkResult VKAPI_CALL getPastPresentationTimingGOOGLE (VkDevice device,
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdSetDiscardRectangleEXT (VkCommandBuffer commandBuffer, deUint32 firstDiscardRectangle, deUint32 discardRectangleCount, const VkRect2D* pDiscardRectangles)
+VKAPI_ATTR void VKAPI_CALL cmdSetDiscardRectangleEXT (VkCommandBuffer commandBuffer, uint32_t firstDiscardRectangle, uint32_t discardRectangleCount, const VkRect2D* pDiscardRectangles)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(firstDiscardRectangle);
@@ -2107,7 +2107,7 @@ VKAPI_ATTR void VKAPI_CALL cmdSetDiscardRectangleEXT (VkCommandBuffer commandBuf
        DE_UNREF(pDiscardRectangles);
 }
 
-VKAPI_ATTR void VKAPI_CALL setHdrMetadataEXT (VkDevice device, deUint32 swapchainCount, const VkSwapchainKHR* pSwapchains, const VkHdrMetadataEXT* pMetadata)
+VKAPI_ATTR void VKAPI_CALL setHdrMetadataEXT (VkDevice device, uint32_t swapchainCount, const VkSwapchainKHR* pSwapchains, const VkHdrMetadataEXT* pMetadata)
 {
        DE_UNREF(device);
        DE_UNREF(swapchainCount);
@@ -2192,7 +2192,7 @@ VKAPI_ATTR VkResult VKAPI_CALL getImageDrmFormatModifierPropertiesEXT (VkDevice
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL mergeValidationCachesEXT (VkDevice device, VkValidationCacheEXT dstCache, deUint32 srcCacheCount, const VkValidationCacheEXT* pSrcCaches)
+VKAPI_ATTR VkResult VKAPI_CALL mergeValidationCachesEXT (VkDevice device, VkValidationCacheEXT dstCache, uint32_t srcCacheCount, const VkValidationCacheEXT* pSrcCaches)
 {
        DE_UNREF(device);
        DE_UNREF(dstCache);
@@ -2217,7 +2217,7 @@ VKAPI_ATTR void VKAPI_CALL cmdBindShadingRateImageNV (VkCommandBuffer commandBuf
        DE_UNREF(imageLayout);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdSetViewportShadingRatePaletteNV (VkCommandBuffer commandBuffer, deUint32 firstViewport, deUint32 viewportCount, const VkShadingRatePaletteNV* pShadingRatePalettes)
+VKAPI_ATTR void VKAPI_CALL cmdSetViewportShadingRatePaletteNV (VkCommandBuffer commandBuffer, uint32_t firstViewport, uint32_t viewportCount, const VkShadingRatePaletteNV* pShadingRatePalettes)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(firstViewport);
@@ -2225,7 +2225,7 @@ VKAPI_ATTR void VKAPI_CALL cmdSetViewportShadingRatePaletteNV (VkCommandBuffer c
        DE_UNREF(pShadingRatePalettes);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdSetCoarseSampleOrderNV (VkCommandBuffer commandBuffer, VkCoarseSampleOrderTypeNV sampleOrderType, deUint32 customSampleOrderCount, const VkCoarseSampleOrderCustomNV* pCustomSampleOrders)
+VKAPI_ATTR void VKAPI_CALL cmdSetCoarseSampleOrderNV (VkCommandBuffer commandBuffer, VkCoarseSampleOrderTypeNV sampleOrderType, uint32_t customSampleOrderCount, const VkCoarseSampleOrderCustomNV* pCustomSampleOrders)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(sampleOrderType);
@@ -2240,7 +2240,7 @@ VKAPI_ATTR void VKAPI_CALL getAccelerationStructureMemoryRequirementsNV (VkDevic
        DE_UNREF(pMemoryRequirements);
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL bindAccelerationStructureMemoryNV (VkDevice device, deUint32 bindInfoCount, const VkBindAccelerationStructureMemoryInfoNV* pBindInfos)
+VKAPI_ATTR VkResult VKAPI_CALL bindAccelerationStructureMemoryNV (VkDevice device, uint32_t bindInfoCount, const VkBindAccelerationStructureMemoryInfoNV* pBindInfos)
 {
        DE_UNREF(device);
        DE_UNREF(bindInfoCount);
@@ -2269,7 +2269,7 @@ VKAPI_ATTR void VKAPI_CALL cmdCopyAccelerationStructureNV (VkCommandBuffer comma
        DE_UNREF(mode);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdTraceRaysNV (VkCommandBuffer commandBuffer, VkBuffer raygenShaderBindingTableBuffer, VkDeviceSize raygenShaderBindingOffset, VkBuffer missShaderBindingTableBuffer, VkDeviceSize missShaderBindingOffset, VkDeviceSize missShaderBindingStride, VkBuffer hitShaderBindingTableBuffer, VkDeviceSize hitShaderBindingOffset, VkDeviceSize hitShaderBindingStride, VkBuffer callableShaderBindingTableBuffer, VkDeviceSize callableShaderBindingOffset, VkDeviceSize callableShaderBindingStride, deUint32 width, deUint32 height, deUint32 depth)
+VKAPI_ATTR void VKAPI_CALL cmdTraceRaysNV (VkCommandBuffer commandBuffer, VkBuffer raygenShaderBindingTableBuffer, VkDeviceSize raygenShaderBindingOffset, VkBuffer missShaderBindingTableBuffer, VkDeviceSize missShaderBindingOffset, VkDeviceSize missShaderBindingStride, VkBuffer hitShaderBindingTableBuffer, VkDeviceSize hitShaderBindingOffset, VkDeviceSize hitShaderBindingStride, VkBuffer callableShaderBindingTableBuffer, VkDeviceSize callableShaderBindingOffset, VkDeviceSize callableShaderBindingStride, uint32_t width, uint32_t height, uint32_t depth)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(raygenShaderBindingTableBuffer);
@@ -2288,7 +2288,7 @@ VKAPI_ATTR void VKAPI_CALL cmdTraceRaysNV (VkCommandBuffer commandBuffer, VkBuff
        DE_UNREF(depth);
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL getRayTracingShaderGroupHandlesKHR (VkDevice device, VkPipeline pipeline, deUint32 firstGroup, deUint32 groupCount, deUintptr dataSize, void* pData)
+VKAPI_ATTR VkResult VKAPI_CALL getRayTracingShaderGroupHandlesKHR (VkDevice device, VkPipeline pipeline, uint32_t firstGroup, uint32_t groupCount, deUintptr dataSize, void* pData)
 {
        DE_UNREF(device);
        DE_UNREF(pipeline);
@@ -2299,7 +2299,7 @@ VKAPI_ATTR VkResult VKAPI_CALL getRayTracingShaderGroupHandlesKHR (VkDevice devi
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL getRayTracingShaderGroupHandlesNV (VkDevice device, VkPipeline pipeline, deUint32 firstGroup, deUint32 groupCount, deUintptr dataSize, void* pData)
+VKAPI_ATTR VkResult VKAPI_CALL getRayTracingShaderGroupHandlesNV (VkDevice device, VkPipeline pipeline, uint32_t firstGroup, uint32_t groupCount, deUintptr dataSize, void* pData)
 {
        DE_UNREF(device);
        DE_UNREF(pipeline);
@@ -2319,7 +2319,7 @@ VKAPI_ATTR VkResult VKAPI_CALL getAccelerationStructureHandleNV (VkDevice device
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdWriteAccelerationStructuresPropertiesNV (VkCommandBuffer commandBuffer, deUint32 accelerationStructureCount, const VkAccelerationStructureNV* pAccelerationStructures, VkQueryType queryType, VkQueryPool queryPool, deUint32 firstQuery)
+VKAPI_ATTR void VKAPI_CALL cmdWriteAccelerationStructuresPropertiesNV (VkCommandBuffer commandBuffer, uint32_t accelerationStructureCount, const VkAccelerationStructureNV* pAccelerationStructures, VkQueryType queryType, VkQueryPool queryPool, uint32_t firstQuery)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(accelerationStructureCount);
@@ -2329,7 +2329,7 @@ VKAPI_ATTR void VKAPI_CALL cmdWriteAccelerationStructuresPropertiesNV (VkCommand
        DE_UNREF(firstQuery);
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL compileDeferredNV (VkDevice device, VkPipeline pipeline, deUint32 shader)
+VKAPI_ATTR VkResult VKAPI_CALL compileDeferredNV (VkDevice device, VkPipeline pipeline, uint32_t shader)
 {
        DE_UNREF(device);
        DE_UNREF(pipeline);
@@ -2346,7 +2346,7 @@ VKAPI_ATTR VkResult VKAPI_CALL getMemoryHostPointerPropertiesEXT (VkDevice devic
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdWriteBufferMarkerAMD (VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkBuffer dstBuffer, VkDeviceSize dstOffset, deUint32 marker)
+VKAPI_ATTR void VKAPI_CALL cmdWriteBufferMarkerAMD (VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkBuffer dstBuffer, VkDeviceSize dstOffset, uint32_t marker)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(pipelineStage);
@@ -2355,7 +2355,7 @@ VKAPI_ATTR void VKAPI_CALL cmdWriteBufferMarkerAMD (VkCommandBuffer commandBuffe
        DE_UNREF(marker);
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDeviceCalibrateableTimeDomainsEXT (VkPhysicalDevice physicalDevice, deUint32* pTimeDomainCount, VkTimeDomainEXT* pTimeDomains)
+VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDeviceCalibrateableTimeDomainsEXT (VkPhysicalDevice physicalDevice, uint32_t* pTimeDomainCount, VkTimeDomainEXT* pTimeDomains)
 {
        DE_UNREF(physicalDevice);
        DE_UNREF(pTimeDomainCount);
@@ -2363,7 +2363,7 @@ VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDeviceCalibrateableTimeDomainsEXT (VkP
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL getCalibratedTimestampsEXT (VkDevice device, deUint32 timestampCount, const VkCalibratedTimestampInfoEXT* pTimestampInfos, deUint64* pTimestamps, deUint64* pMaxDeviation)
+VKAPI_ATTR VkResult VKAPI_CALL getCalibratedTimestampsEXT (VkDevice device, uint32_t timestampCount, const VkCalibratedTimestampInfoEXT* pTimestampInfos, deUint64* pTimestamps, deUint64* pMaxDeviation)
 {
        DE_UNREF(device);
        DE_UNREF(timestampCount);
@@ -2373,14 +2373,14 @@ VKAPI_ATTR VkResult VKAPI_CALL getCalibratedTimestampsEXT (VkDevice device, deUi
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdDrawMeshTasksNV (VkCommandBuffer commandBuffer, deUint32 taskCount, deUint32 firstTask)
+VKAPI_ATTR void VKAPI_CALL cmdDrawMeshTasksNV (VkCommandBuffer commandBuffer, uint32_t taskCount, uint32_t firstTask)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(taskCount);
        DE_UNREF(firstTask);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdDrawMeshTasksIndirectNV (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, deUint32 drawCount, deUint32 stride)
+VKAPI_ATTR void VKAPI_CALL cmdDrawMeshTasksIndirectNV (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(buffer);
@@ -2389,7 +2389,7 @@ VKAPI_ATTR void VKAPI_CALL cmdDrawMeshTasksIndirectNV (VkCommandBuffer commandBu
        DE_UNREF(stride);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdDrawMeshTasksIndirectCountNV (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, deUint32 maxDrawCount, deUint32 stride)
+VKAPI_ATTR void VKAPI_CALL cmdDrawMeshTasksIndirectCountNV (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(buffer);
@@ -2400,7 +2400,7 @@ VKAPI_ATTR void VKAPI_CALL cmdDrawMeshTasksIndirectCountNV (VkCommandBuffer comm
        DE_UNREF(stride);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdSetExclusiveScissorNV (VkCommandBuffer commandBuffer, deUint32 firstExclusiveScissor, deUint32 exclusiveScissorCount, const VkRect2D* pExclusiveScissors)
+VKAPI_ATTR void VKAPI_CALL cmdSetExclusiveScissorNV (VkCommandBuffer commandBuffer, uint32_t firstExclusiveScissor, uint32_t exclusiveScissorCount, const VkRect2D* pExclusiveScissors)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(firstExclusiveScissor);
@@ -2414,7 +2414,7 @@ VKAPI_ATTR void VKAPI_CALL cmdSetCheckpointNV (VkCommandBuffer commandBuffer, co
        DE_UNREF(pCheckpointMarker);
 }
 
-VKAPI_ATTR void VKAPI_CALL getQueueCheckpointDataNV (VkQueue queue, deUint32* pCheckpointDataCount, VkCheckpointDataNV* pCheckpointData)
+VKAPI_ATTR void VKAPI_CALL getQueueCheckpointDataNV (VkQueue queue, uint32_t* pCheckpointDataCount, VkCheckpointDataNV* pCheckpointData)
 {
        DE_UNREF(queue);
        DE_UNREF(pCheckpointDataCount);
@@ -2498,7 +2498,7 @@ VKAPI_ATTR VkDeviceAddress VKAPI_CALL getBufferDeviceAddressEXT (VkDevice device
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDeviceToolPropertiesEXT (VkPhysicalDevice physicalDevice, deUint32* pToolCount, VkPhysicalDeviceToolPropertiesEXT* pToolProperties)
+VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDeviceToolPropertiesEXT (VkPhysicalDevice physicalDevice, uint32_t* pToolCount, VkPhysicalDeviceToolPropertiesEXT* pToolProperties)
 {
        DE_UNREF(physicalDevice);
        DE_UNREF(pToolCount);
@@ -2506,7 +2506,7 @@ VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDeviceToolPropertiesEXT (VkPhysicalDev
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDeviceCooperativeMatrixPropertiesNV (VkPhysicalDevice physicalDevice, deUint32* pPropertyCount, VkCooperativeMatrixPropertiesNV* pProperties)
+VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDeviceCooperativeMatrixPropertiesNV (VkPhysicalDevice physicalDevice, uint32_t* pPropertyCount, VkCooperativeMatrixPropertiesNV* pProperties)
 {
        DE_UNREF(physicalDevice);
        DE_UNREF(pPropertyCount);
@@ -2514,7 +2514,7 @@ VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDeviceCooperativeMatrixPropertiesNV (V
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV (VkPhysicalDevice physicalDevice, deUint32* pCombinationCount, VkFramebufferMixedSamplesCombinationNV* pCombinations)
+VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV (VkPhysicalDevice physicalDevice, uint32_t* pCombinationCount, VkFramebufferMixedSamplesCombinationNV* pCombinations)
 {
        DE_UNREF(physicalDevice);
        DE_UNREF(pCombinationCount);
@@ -2522,7 +2522,7 @@ VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDeviceSupportedFramebufferMixedSamples
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdSetLineStippleEXT (VkCommandBuffer commandBuffer, deUint32 lineStippleFactor, deUint16 lineStipplePattern)
+VKAPI_ATTR void VKAPI_CALL cmdSetLineStippleEXT (VkCommandBuffer commandBuffer, uint32_t lineStippleFactor, deUint16 lineStipplePattern)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(lineStippleFactor);
@@ -2547,21 +2547,21 @@ VKAPI_ATTR void VKAPI_CALL cmdSetPrimitiveTopologyEXT (VkCommandBuffer commandBu
        DE_UNREF(primitiveTopology);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdSetViewportWithCountEXT (VkCommandBuffer commandBuffer, deUint32 viewportCount, const VkViewport* pViewports)
+VKAPI_ATTR void VKAPI_CALL cmdSetViewportWithCountEXT (VkCommandBuffer commandBuffer, uint32_t viewportCount, const VkViewport* pViewports)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(viewportCount);
        DE_UNREF(pViewports);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdSetScissorWithCountEXT (VkCommandBuffer commandBuffer, deUint32 scissorCount, const VkRect2D* pScissors)
+VKAPI_ATTR void VKAPI_CALL cmdSetScissorWithCountEXT (VkCommandBuffer commandBuffer, uint32_t scissorCount, const VkRect2D* pScissors)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(scissorCount);
        DE_UNREF(pScissors);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdBindVertexBuffers2EXT (VkCommandBuffer commandBuffer, deUint32 firstBinding, deUint32 bindingCount, const VkBuffer* pBuffers, const VkDeviceSize* pOffsets, const VkDeviceSize* pSizes, const VkDeviceSize* pStrides)
+VKAPI_ATTR void VKAPI_CALL cmdBindVertexBuffers2EXT (VkCommandBuffer commandBuffer, uint32_t firstBinding, uint32_t bindingCount, const VkBuffer* pBuffers, const VkDeviceSize* pOffsets, const VkDeviceSize* pSizes, const VkDeviceSize* pStrides)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(firstBinding);
@@ -2632,7 +2632,7 @@ VKAPI_ATTR void VKAPI_CALL cmdExecuteGeneratedCommandsNV (VkCommandBuffer comman
        DE_UNREF(pGeneratedCommandsInfo);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdBindPipelineShaderGroupNV (VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline pipeline, deUint32 groupIndex)
+VKAPI_ATTR void VKAPI_CALL cmdBindPipelineShaderGroupNV (VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline pipeline, uint32_t groupIndex)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(pipelineBindPoint);
@@ -2640,7 +2640,7 @@ VKAPI_ATTR void VKAPI_CALL cmdBindPipelineShaderGroupNV (VkCommandBuffer command
        DE_UNREF(groupIndex);
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL acquireDrmDisplayEXT (VkPhysicalDevice physicalDevice, deInt32 drmFd, VkDisplayKHR display)
+VKAPI_ATTR VkResult VKAPI_CALL acquireDrmDisplayEXT (VkPhysicalDevice physicalDevice, int32_t drmFd, VkDisplayKHR display)
 {
        DE_UNREF(physicalDevice);
        DE_UNREF(drmFd);
@@ -2648,7 +2648,7 @@ VKAPI_ATTR VkResult VKAPI_CALL acquireDrmDisplayEXT (VkPhysicalDevice physicalDe
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL getDrmDisplayEXT (VkPhysicalDevice physicalDevice, deInt32 drmFd, deUint32 connectorId, VkDisplayKHR* display)
+VKAPI_ATTR VkResult VKAPI_CALL getDrmDisplayEXT (VkPhysicalDevice physicalDevice, int32_t drmFd, uint32_t connectorId, VkDisplayKHR* display)
 {
        DE_UNREF(physicalDevice);
        DE_UNREF(drmFd);
@@ -2690,7 +2690,7 @@ VKAPI_ATTR VkResult VKAPI_CALL acquireWinrtDisplayNV (VkPhysicalDevice physicalD
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL getWinrtDisplayNV (VkPhysicalDevice physicalDevice, deUint32 deviceRelativeId, VkDisplayKHR* pDisplay)
+VKAPI_ATTR VkResult VKAPI_CALL getWinrtDisplayNV (VkPhysicalDevice physicalDevice, uint32_t deviceRelativeId, VkDisplayKHR* pDisplay)
 {
        DE_UNREF(physicalDevice);
        DE_UNREF(deviceRelativeId);
@@ -2698,7 +2698,7 @@ VKAPI_ATTR VkResult VKAPI_CALL getWinrtDisplayNV (VkPhysicalDevice physicalDevic
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdSetVertexInputEXT (VkCommandBuffer commandBuffer, deUint32 vertexBindingDescriptionCount, const VkVertexInputBindingDescription2EXT* pVertexBindingDescriptions, deUint32 vertexAttributeDescriptionCount, const VkVertexInputAttributeDescription2EXT* pVertexAttributeDescriptions)
+VKAPI_ATTR void VKAPI_CALL cmdSetVertexInputEXT (VkCommandBuffer commandBuffer, uint32_t vertexBindingDescriptionCount, const VkVertexInputBindingDescription2EXT* pVertexBindingDescriptions, uint32_t vertexAttributeDescriptionCount, const VkVertexInputAttributeDescription2EXT* pVertexAttributeDescriptions)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(vertexBindingDescriptionCount);
@@ -2728,7 +2728,7 @@ VKAPI_ATTR VkResult VKAPI_CALL getMemoryRemoteAddressNV (VkDevice device, const
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdSetPatchControlPointsEXT (VkCommandBuffer commandBuffer, deUint32 patchControlPoints)
+VKAPI_ATTR void VKAPI_CALL cmdSetPatchControlPointsEXT (VkCommandBuffer commandBuffer, uint32_t patchControlPoints)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(patchControlPoints);
@@ -2758,14 +2758,14 @@ VKAPI_ATTR void VKAPI_CALL cmdSetPrimitiveRestartEnableEXT (VkCommandBuffer comm
        DE_UNREF(primitiveRestartEnable);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdSetColorWriteEnableEXT (VkCommandBuffer commandBuffer, deUint32 attachmentCount, const VkBool32* pColorWriteEnables)
+VKAPI_ATTR void VKAPI_CALL cmdSetColorWriteEnableEXT (VkCommandBuffer commandBuffer, uint32_t attachmentCount, const VkBool32* pColorWriteEnables)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(attachmentCount);
        DE_UNREF(pColorWriteEnables);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdDrawMultiEXT (VkCommandBuffer commandBuffer, deUint32 drawCount, const VkMultiDrawInfoEXT* pVertexInfo, deUint32 instanceCount, deUint32 firstInstance, deUint32 stride)
+VKAPI_ATTR void VKAPI_CALL cmdDrawMultiEXT (VkCommandBuffer commandBuffer, uint32_t drawCount, const VkMultiDrawInfoEXT* pVertexInfo, uint32_t instanceCount, uint32_t firstInstance, uint32_t stride)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(drawCount);
@@ -2775,7 +2775,7 @@ VKAPI_ATTR void VKAPI_CALL cmdDrawMultiEXT (VkCommandBuffer commandBuffer, deUin
        DE_UNREF(stride);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdDrawMultiIndexedEXT (VkCommandBuffer commandBuffer, deUint32 drawCount, const VkMultiDrawIndexedInfoEXT* pIndexInfo, deUint32 instanceCount, deUint32 firstInstance, deUint32 stride, const deInt32* pVertexOffset)
+VKAPI_ATTR void VKAPI_CALL cmdDrawMultiIndexedEXT (VkCommandBuffer commandBuffer, uint32_t drawCount, const VkMultiDrawIndexedInfoEXT* pIndexInfo, uint32_t instanceCount, uint32_t firstInstance, uint32_t stride, const int32_t* pVertexOffset)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(drawCount);
@@ -2786,7 +2786,7 @@ VKAPI_ATTR void VKAPI_CALL cmdDrawMultiIndexedEXT (VkCommandBuffer commandBuffer
        DE_UNREF(pVertexOffset);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdBuildAccelerationStructuresKHR (VkCommandBuffer commandBuffer, deUint32 infoCount, const VkAccelerationStructureBuildGeometryInfoKHR* pInfos, const VkAccelerationStructureBuildRangeInfoKHR* const* ppBuildRangeInfos)
+VKAPI_ATTR void VKAPI_CALL cmdBuildAccelerationStructuresKHR (VkCommandBuffer commandBuffer, uint32_t infoCount, const VkAccelerationStructureBuildGeometryInfoKHR* pInfos, const VkAccelerationStructureBuildRangeInfoKHR* const* ppBuildRangeInfos)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(infoCount);
@@ -2794,7 +2794,7 @@ VKAPI_ATTR void VKAPI_CALL cmdBuildAccelerationStructuresKHR (VkCommandBuffer co
        DE_UNREF(ppBuildRangeInfos);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdBuildAccelerationStructuresIndirectKHR (VkCommandBuffer commandBuffer, deUint32 infoCount, const VkAccelerationStructureBuildGeometryInfoKHR* pInfos, const VkDeviceAddress* pIndirectDeviceAddresses, const deUint32* pIndirectStrides, const deUint32* const* ppMaxPrimitiveCounts)
+VKAPI_ATTR void VKAPI_CALL cmdBuildAccelerationStructuresIndirectKHR (VkCommandBuffer commandBuffer, uint32_t infoCount, const VkAccelerationStructureBuildGeometryInfoKHR* pInfos, const VkDeviceAddress* pIndirectDeviceAddresses, const uint32_t* pIndirectStrides, const uint32_t* const* ppMaxPrimitiveCounts)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(infoCount);
@@ -2804,7 +2804,7 @@ VKAPI_ATTR void VKAPI_CALL cmdBuildAccelerationStructuresIndirectKHR (VkCommandB
        DE_UNREF(ppMaxPrimitiveCounts);
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL buildAccelerationStructuresKHR (VkDevice device, VkDeferredOperationKHR deferredOperation, deUint32 infoCount, const VkAccelerationStructureBuildGeometryInfoKHR* pInfos, const VkAccelerationStructureBuildRangeInfoKHR* const* ppBuildRangeInfos)
+VKAPI_ATTR VkResult VKAPI_CALL buildAccelerationStructuresKHR (VkDevice device, VkDeferredOperationKHR deferredOperation, uint32_t infoCount, const VkAccelerationStructureBuildGeometryInfoKHR* pInfos, const VkAccelerationStructureBuildRangeInfoKHR* const* ppBuildRangeInfos)
 {
        DE_UNREF(device);
        DE_UNREF(deferredOperation);
@@ -2838,7 +2838,7 @@ VKAPI_ATTR VkResult VKAPI_CALL copyMemoryToAccelerationStructureKHR (VkDevice de
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL writeAccelerationStructuresPropertiesKHR (VkDevice device, deUint32 accelerationStructureCount, const VkAccelerationStructureKHR* pAccelerationStructures, VkQueryType queryType, deUintptr dataSize, void* pData, deUintptr stride)
+VKAPI_ATTR VkResult VKAPI_CALL writeAccelerationStructuresPropertiesKHR (VkDevice device, uint32_t accelerationStructureCount, const VkAccelerationStructureKHR* pAccelerationStructures, VkQueryType queryType, deUintptr dataSize, void* pData, deUintptr stride)
 {
        DE_UNREF(device);
        DE_UNREF(accelerationStructureCount);
@@ -2875,7 +2875,7 @@ VKAPI_ATTR VkDeviceAddress VKAPI_CALL getAccelerationStructureDeviceAddressKHR (
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdWriteAccelerationStructuresPropertiesKHR (VkCommandBuffer commandBuffer, deUint32 accelerationStructureCount, const VkAccelerationStructureKHR* pAccelerationStructures, VkQueryType queryType, VkQueryPool queryPool, deUint32 firstQuery)
+VKAPI_ATTR void VKAPI_CALL cmdWriteAccelerationStructuresPropertiesKHR (VkCommandBuffer commandBuffer, uint32_t accelerationStructureCount, const VkAccelerationStructureKHR* pAccelerationStructures, VkQueryType queryType, VkQueryPool queryPool, uint32_t firstQuery)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(accelerationStructureCount);
@@ -2892,7 +2892,7 @@ VKAPI_ATTR void VKAPI_CALL getDeviceAccelerationStructureCompatibilityKHR (VkDev
        DE_UNREF(pCompatibility);
 }
 
-VKAPI_ATTR void VKAPI_CALL getAccelerationStructureBuildSizesKHR (VkDevice device, VkAccelerationStructureBuildTypeKHR buildType, const VkAccelerationStructureBuildGeometryInfoKHR* pBuildInfo, const deUint32* pMaxPrimitiveCounts, VkAccelerationStructureBuildSizesInfoKHR* pSizeInfo)
+VKAPI_ATTR void VKAPI_CALL getAccelerationStructureBuildSizesKHR (VkDevice device, VkAccelerationStructureBuildTypeKHR buildType, const VkAccelerationStructureBuildGeometryInfoKHR* pBuildInfo, const uint32_t* pMaxPrimitiveCounts, VkAccelerationStructureBuildSizesInfoKHR* pSizeInfo)
 {
        DE_UNREF(device);
        DE_UNREF(buildType);
@@ -2901,7 +2901,7 @@ VKAPI_ATTR void VKAPI_CALL getAccelerationStructureBuildSizesKHR (VkDevice devic
        DE_UNREF(pSizeInfo);
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdTraceRaysKHR (VkCommandBuffer commandBuffer, const VkStridedDeviceAddressRegionKHR* pRaygenShaderBindingTable, const VkStridedDeviceAddressRegionKHR* pMissShaderBindingTable, const VkStridedDeviceAddressRegionKHR* pHitShaderBindingTable, const VkStridedDeviceAddressRegionKHR* pCallableShaderBindingTable, deUint32 width, deUint32 height, deUint32 depth)
+VKAPI_ATTR void VKAPI_CALL cmdTraceRaysKHR (VkCommandBuffer commandBuffer, const VkStridedDeviceAddressRegionKHR* pRaygenShaderBindingTable, const VkStridedDeviceAddressRegionKHR* pMissShaderBindingTable, const VkStridedDeviceAddressRegionKHR* pHitShaderBindingTable, const VkStridedDeviceAddressRegionKHR* pCallableShaderBindingTable, uint32_t width, uint32_t height, uint32_t depth)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(pRaygenShaderBindingTable);
@@ -2913,7 +2913,7 @@ VKAPI_ATTR void VKAPI_CALL cmdTraceRaysKHR (VkCommandBuffer commandBuffer, const
        DE_UNREF(depth);
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL getRayTracingCaptureReplayShaderGroupHandlesKHR (VkDevice device, VkPipeline pipeline, deUint32 firstGroup, deUint32 groupCount, deUintptr dataSize, void* pData)
+VKAPI_ATTR VkResult VKAPI_CALL getRayTracingCaptureReplayShaderGroupHandlesKHR (VkDevice device, VkPipeline pipeline, uint32_t firstGroup, uint32_t groupCount, deUintptr dataSize, void* pData)
 {
        DE_UNREF(device);
        DE_UNREF(pipeline);
@@ -2934,7 +2934,7 @@ VKAPI_ATTR void VKAPI_CALL cmdTraceRaysIndirectKHR (VkCommandBuffer commandBuffe
        DE_UNREF(indirectDeviceAddress);
 }
 
-VKAPI_ATTR VkDeviceSize VKAPI_CALL getRayTracingShaderGroupStackSizeKHR (VkDevice device, VkPipeline pipeline, deUint32 group, VkShaderGroupShaderKHR groupShader)
+VKAPI_ATTR VkDeviceSize VKAPI_CALL getRayTracingShaderGroupStackSizeKHR (VkDevice device, VkPipeline pipeline, uint32_t group, VkShaderGroupShaderKHR groupShader)
 {
        DE_UNREF(device);
        DE_UNREF(pipeline);
@@ -2943,7 +2943,7 @@ VKAPI_ATTR VkDeviceSize VKAPI_CALL getRayTracingShaderGroupStackSizeKHR (VkDevic
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR void VKAPI_CALL cmdSetRayTracingPipelineStackSizeKHR (VkCommandBuffer commandBuffer, deUint32 pipelineStackSize)
+VKAPI_ATTR void VKAPI_CALL cmdSetRayTracingPipelineStackSizeKHR (VkCommandBuffer commandBuffer, uint32_t pipelineStackSize)
 {
        DE_UNREF(commandBuffer);
        DE_UNREF(pipelineStackSize);
@@ -2965,7 +2965,7 @@ VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDeviceVideoCapabilitiesKHR (VkPhysical
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDeviceVideoFormatPropertiesKHR (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceVideoFormatInfoKHR* pVideoFormatInfo, deUint32* pVideoFormatPropertyCount, VkVideoFormatPropertiesKHR* pVideoFormatProperties)
+VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDeviceVideoFormatPropertiesKHR (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceVideoFormatInfoKHR* pVideoFormatInfo, uint32_t* pVideoFormatPropertyCount, VkVideoFormatPropertiesKHR* pVideoFormatProperties)
 {
        DE_UNREF(physicalDevice);
        DE_UNREF(pVideoFormatInfo);
@@ -2974,7 +2974,7 @@ VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDeviceVideoFormatPropertiesKHR (VkPhys
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL getVideoSessionMemoryRequirementsKHR (VkDevice device, VkVideoSessionKHR videoSession, deUint32* pVideoSessionMemoryRequirementsCount, VkVideoGetMemoryPropertiesKHR* pVideoSessionMemoryRequirements)
+VKAPI_ATTR VkResult VKAPI_CALL getVideoSessionMemoryRequirementsKHR (VkDevice device, VkVideoSessionKHR videoSession, uint32_t* pVideoSessionMemoryRequirementsCount, VkVideoGetMemoryPropertiesKHR* pVideoSessionMemoryRequirements)
 {
        DE_UNREF(device);
        DE_UNREF(videoSession);
@@ -2983,7 +2983,7 @@ VKAPI_ATTR VkResult VKAPI_CALL getVideoSessionMemoryRequirementsKHR (VkDevice de
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL bindVideoSessionMemoryKHR (VkDevice device, VkVideoSessionKHR videoSession, deUint32 videoSessionBindMemoryCount, const VkVideoBindMemoryKHR* pVideoSessionBindMemories)
+VKAPI_ATTR VkResult VKAPI_CALL bindVideoSessionMemoryKHR (VkDevice device, VkVideoSessionKHR videoSession, uint32_t videoSessionBindMemoryCount, const VkVideoBindMemoryKHR* pVideoSessionBindMemories)
 {
        DE_UNREF(device);
        DE_UNREF(videoSession);
@@ -3062,7 +3062,7 @@ VKAPI_ATTR VkResult VKAPI_CALL getSemaphoreZirconHandleFUCHSIA (VkDevice device,
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkBool32 VKAPI_CALL getPhysicalDeviceWaylandPresentationSupportKHR (VkPhysicalDevice physicalDevice, deUint32 queueFamilyIndex, pt::WaylandDisplayPtr display)
+VKAPI_ATTR VkBool32 VKAPI_CALL getPhysicalDeviceWaylandPresentationSupportKHR (VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, pt::WaylandDisplayPtr display)
 {
        DE_UNREF(physicalDevice);
        DE_UNREF(queueFamilyIndex);
@@ -3070,7 +3070,7 @@ VKAPI_ATTR VkBool32 VKAPI_CALL getPhysicalDeviceWaylandPresentationSupportKHR (V
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkBool32 VKAPI_CALL getPhysicalDeviceWin32PresentationSupportKHR (VkPhysicalDevice physicalDevice, deUint32 queueFamilyIndex)
+VKAPI_ATTR VkBool32 VKAPI_CALL getPhysicalDeviceWin32PresentationSupportKHR (VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex)
 {
        DE_UNREF(physicalDevice);
        DE_UNREF(queueFamilyIndex);
@@ -3133,7 +3133,7 @@ VKAPI_ATTR VkResult VKAPI_CALL getMemoryWin32HandleNV (VkDevice device, VkDevice
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDeviceSurfacePresentModes2EXT (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo, deUint32* pPresentModeCount, VkPresentModeKHR* pPresentModes)
+VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDeviceSurfacePresentModes2EXT (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo, uint32_t* pPresentModeCount, VkPresentModeKHR* pPresentModes)
 {
        DE_UNREF(physicalDevice);
        DE_UNREF(pSurfaceInfo);
@@ -3164,7 +3164,7 @@ VKAPI_ATTR VkResult VKAPI_CALL getDeviceGroupSurfacePresentModes2EXT (VkDevice d
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkBool32 VKAPI_CALL getPhysicalDeviceXcbPresentationSupportKHR (VkPhysicalDevice physicalDevice, deUint32 queueFamilyIndex, pt::XcbConnectionPtr connection, pt::XcbVisualid visual_id)
+VKAPI_ATTR VkBool32 VKAPI_CALL getPhysicalDeviceXcbPresentationSupportKHR (VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, pt::XcbConnectionPtr connection, pt::XcbVisualid visual_id)
 {
        DE_UNREF(physicalDevice);
        DE_UNREF(queueFamilyIndex);
@@ -3173,7 +3173,7 @@ VKAPI_ATTR VkBool32 VKAPI_CALL getPhysicalDeviceXcbPresentationSupportKHR (VkPhy
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkBool32 VKAPI_CALL getPhysicalDeviceXlibPresentationSupportKHR (VkPhysicalDevice physicalDevice, deUint32 queueFamilyIndex, pt::XlibDisplayPtr dpy, pt::XlibVisualID visualID)
+VKAPI_ATTR VkBool32 VKAPI_CALL getPhysicalDeviceXlibPresentationSupportKHR (VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, pt::XlibDisplayPtr dpy, pt::XlibVisualID visualID)
 {
        DE_UNREF(physicalDevice);
        DE_UNREF(queueFamilyIndex);
index 07880fe..7065e56 100644 (file)
@@ -12,17 +12,17 @@ PFN_vkVoidFunction PlatformDriver::getInstanceProcAddr (VkInstance instance, con
        return m_vk.getInstanceProcAddr(instance, pName);
 }
 
-VkResult PlatformDriver::enumerateInstanceExtensionProperties (const char* pLayerName, deUint32* pPropertyCount, VkExtensionProperties* pProperties) const
+VkResult PlatformDriver::enumerateInstanceExtensionProperties (const char* pLayerName, uint32_t* pPropertyCount, VkExtensionProperties* pProperties) const
 {
        return m_vk.enumerateInstanceExtensionProperties(pLayerName, pPropertyCount, pProperties);
 }
 
-VkResult PlatformDriver::enumerateInstanceLayerProperties (deUint32* pPropertyCount, VkLayerProperties* pProperties) const
+VkResult PlatformDriver::enumerateInstanceLayerProperties (uint32_t* pPropertyCount, VkLayerProperties* pProperties) const
 {
        return m_vk.enumerateInstanceLayerProperties(pPropertyCount, pProperties);
 }
 
-VkResult PlatformDriver::enumerateInstanceVersion (deUint32* pApiVersion) const
+VkResult PlatformDriver::enumerateInstanceVersion (uint32_t* pApiVersion) const
 {
        if (m_vk.enumerateInstanceVersion)
                return m_vk.enumerateInstanceVersion(pApiVersion);
index 9daf4e3..3d924f2 100644 (file)
@@ -26,7 +26,7 @@ Move<VkDescriptorUpdateTemplate>      createDescriptorUpdateTemplate          (const DeviceIn
 Move<VkRenderPass>                                     createRenderPass2                                       (const DeviceInterface& vk, VkDevice device, const VkRenderPassCreateInfo2* pCreateInfo, const VkAllocationCallbacks* pAllocator = DE_NULL);
 Move<VkSwapchainKHR>                           createSwapchainKHR                                      (const DeviceInterface& vk, VkDevice device, const VkSwapchainCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator = DE_NULL);
 Move<VkSurfaceKHR>                                     createDisplayPlaneSurfaceKHR            (const InstanceInterface& vk, VkInstance instance, const VkDisplaySurfaceCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator = DE_NULL);
-Move<VkSwapchainKHR>                           createSharedSwapchainsKHR                       (const DeviceInterface& vk, VkDevice device, deUint32 swapchainCount, const VkSwapchainCreateInfoKHR* pCreateInfos, const VkAllocationCallbacks* pAllocator = DE_NULL);
+Move<VkSwapchainKHR>                           createSharedSwapchainsKHR                       (const DeviceInterface& vk, VkDevice device, uint32_t swapchainCount, const VkSwapchainCreateInfoKHR* pCreateInfos, const VkAllocationCallbacks* pAllocator = DE_NULL);
 Move<VkDeferredOperationKHR>           createDeferredOperationKHR                      (const DeviceInterface& vk, VkDevice device, const VkAllocationCallbacks* pAllocator = DE_NULL);
 Move<VkDebugReportCallbackEXT>         createDebugReportCallbackEXT            (const InstanceInterface& vk, VkInstance instance, const VkDebugReportCallbackCreateInfoEXT* pCreateInfo, const VkAllocationCallbacks* pAllocator = DE_NULL);
 Move<VkCuModuleNVX>                                    createCuModuleNVX                                       (const DeviceInterface& vk, VkDevice device, const VkCuModuleCreateInfoNVX* pCreateInfo, const VkAllocationCallbacks* pAllocator = DE_NULL);
index 9237542..7f9db0c 100644 (file)
@@ -373,7 +373,7 @@ Move<VkSurfaceKHR> createDisplayPlaneSurfaceKHR (const InstanceInterface& vk, Vk
        return Move<VkSurfaceKHR>(check<VkSurfaceKHR>(object), Deleter<VkSurfaceKHR>(vk, instance, pAllocator));
 }
 
-Move<VkSwapchainKHR> createSharedSwapchainsKHR (const DeviceInterface& vk, VkDevice device, deUint32 swapchainCount, const VkSwapchainCreateInfoKHR* pCreateInfos, const VkAllocationCallbacks* pAllocator)
+Move<VkSwapchainKHR> createSharedSwapchainsKHR (const DeviceInterface& vk, VkDevice device, uint32_t swapchainCount, const VkSwapchainCreateInfoKHR* pCreateInfos, const VkAllocationCallbacks* pAllocator)
 {
        VkSwapchainKHR object = 0;
        VK_CHECK(vk.createSharedSwapchainsKHR(device, swapchainCount, pCreateInfos, pAllocator, &object));
index d42e2a8..c47602d 100644 (file)
@@ -3,28 +3,28 @@
  */
 struct VkExtent2D
 {
-       deUint32        width;
-       deUint32        height;
+       uint32_t        width;
+       uint32_t        height;
 };
 
 struct VkExtent3D
 {
-       deUint32        width;
-       deUint32        height;
-       deUint32        depth;
+       uint32_t        width;
+       uint32_t        height;
+       uint32_t        depth;
 };
 
 struct VkOffset2D
 {
-       deInt32 x;
-       deInt32 y;
+       int32_t x;
+       int32_t y;
 };
 
 struct VkOffset3D
 {
-       deInt32 x;
-       deInt32 y;
-       deInt32 z;
+       int32_t x;
+       int32_t y;
+       int32_t z;
 };
 
 struct VkRect2D
@@ -51,8 +51,8 @@ struct VkBufferMemoryBarrier
        const void*             pNext;
        VkAccessFlags   srcAccessMask;
        VkAccessFlags   dstAccessMask;
-       deUint32                srcQueueFamilyIndex;
-       deUint32                dstQueueFamilyIndex;
+       uint32_t                srcQueueFamilyIndex;
+       uint32_t                dstQueueFamilyIndex;
        VkBuffer                buffer;
        VkDeviceSize    offset;
        VkDeviceSize    size;
@@ -60,35 +60,35 @@ struct VkBufferMemoryBarrier
 
 struct VkDispatchIndirectCommand
 {
-       deUint32        x;
-       deUint32        y;
-       deUint32        z;
+       uint32_t        x;
+       uint32_t        y;
+       uint32_t        z;
 };
 
 struct VkDrawIndexedIndirectCommand
 {
-       deUint32        indexCount;
-       deUint32        instanceCount;
-       deUint32        firstIndex;
-       deInt32         vertexOffset;
-       deUint32        firstInstance;
+       uint32_t        indexCount;
+       uint32_t        instanceCount;
+       uint32_t        firstIndex;
+       int32_t         vertexOffset;
+       uint32_t        firstInstance;
 };
 
 struct VkDrawIndirectCommand
 {
-       deUint32        vertexCount;
-       deUint32        instanceCount;
-       deUint32        firstVertex;
-       deUint32        firstInstance;
+       uint32_t        vertexCount;
+       uint32_t        instanceCount;
+       uint32_t        firstVertex;
+       uint32_t        firstInstance;
 };
 
 struct VkImageSubresourceRange
 {
        VkImageAspectFlags      aspectMask;
-       deUint32                        baseMipLevel;
-       deUint32                        levelCount;
-       deUint32                        baseArrayLayer;
-       deUint32                        layerCount;
+       uint32_t                        baseMipLevel;
+       uint32_t                        levelCount;
+       uint32_t                        baseArrayLayer;
+       uint32_t                        layerCount;
 };
 
 struct VkImageMemoryBarrier
@@ -99,8 +99,8 @@ struct VkImageMemoryBarrier
        VkAccessFlags                   dstAccessMask;
        VkImageLayout                   oldLayout;
        VkImageLayout                   newLayout;
-       deUint32                                srcQueueFamilyIndex;
-       deUint32                                dstQueueFamilyIndex;
+       uint32_t                                srcQueueFamilyIndex;
+       uint32_t                                dstQueueFamilyIndex;
        VkImage                                 image;
        VkImageSubresourceRange subresourceRange;
 };
@@ -115,10 +115,10 @@ struct VkMemoryBarrier
 
 struct VkPipelineCacheHeaderVersionOne
 {
-       deUint32                                                headerSize;
+       uint32_t                                                headerSize;
        VkPipelineCacheHeaderVersion    headerVersion;
-       deUint32                                                vendorID;
-       deUint32                                                deviceID;
+       uint32_t                                                vendorID;
+       uint32_t                                                deviceID;
        deUint8                                                 pipelineCacheUUID[VK_UUID_SIZE];
 };
 
@@ -137,10 +137,10 @@ struct VkApplicationInfo
        VkStructureType sType;
        const void*             pNext;
        const char*             pApplicationName;
-       deUint32                applicationVersion;
+       uint32_t                applicationVersion;
        const char*             pEngineName;
-       deUint32                engineVersion;
-       deUint32                apiVersion;
+       uint32_t                engineVersion;
+       uint32_t                apiVersion;
 };
 
 struct VkFormatProperties
@@ -153,8 +153,8 @@ struct VkFormatProperties
 struct VkImageFormatProperties
 {
        VkExtent3D                      maxExtent;
-       deUint32                        maxMipLevels;
-       deUint32                        maxArrayLayers;
+       uint32_t                        maxMipLevels;
+       uint32_t                        maxArrayLayers;
        VkSampleCountFlags      sampleCounts;
        VkDeviceSize            maxResourceSize;
 };
@@ -165,9 +165,9 @@ struct VkInstanceCreateInfo
        const void*                                     pNext;
        VkInstanceCreateFlags           flags;
        const VkApplicationInfo*        pApplicationInfo;
-       deUint32                                        enabledLayerCount;
+       uint32_t                                        enabledLayerCount;
        const char* const*                      ppEnabledLayerNames;
-       deUint32                                        enabledExtensionCount;
+       uint32_t                                        enabledExtensionCount;
        const char* const*                      ppEnabledExtensionNames;
 };
 
@@ -180,7 +180,7 @@ struct VkMemoryHeap
 struct VkMemoryType
 {
        VkMemoryPropertyFlags   propertyFlags;
-       deUint32                                heapIndex;
+       uint32_t                                heapIndex;
 };
 
 struct VkPhysicalDeviceFeatures
@@ -244,103 +244,103 @@ struct VkPhysicalDeviceFeatures
 
 struct VkPhysicalDeviceLimits
 {
-       deUint32                        maxImageDimension1D;
-       deUint32                        maxImageDimension2D;
-       deUint32                        maxImageDimension3D;
-       deUint32                        maxImageDimensionCube;
-       deUint32                        maxImageArrayLayers;
-       deUint32                        maxTexelBufferElements;
-       deUint32                        maxUniformBufferRange;
-       deUint32                        maxStorageBufferRange;
-       deUint32                        maxPushConstantsSize;
-       deUint32                        maxMemoryAllocationCount;
-       deUint32                        maxSamplerAllocationCount;
+       uint32_t                        maxImageDimension1D;
+       uint32_t                        maxImageDimension2D;
+       uint32_t                        maxImageDimension3D;
+       uint32_t                        maxImageDimensionCube;
+       uint32_t                        maxImageArrayLayers;
+       uint32_t                        maxTexelBufferElements;
+       uint32_t                        maxUniformBufferRange;
+       uint32_t                        maxStorageBufferRange;
+       uint32_t                        maxPushConstantsSize;
+       uint32_t                        maxMemoryAllocationCount;
+       uint32_t                        maxSamplerAllocationCount;
        VkDeviceSize            bufferImageGranularity;
        VkDeviceSize            sparseAddressSpaceSize;
-       deUint32                        maxBoundDescriptorSets;
-       deUint32                        maxPerStageDescriptorSamplers;
-       deUint32                        maxPerStageDescriptorUniformBuffers;
-       deUint32                        maxPerStageDescriptorStorageBuffers;
-       deUint32                        maxPerStageDescriptorSampledImages;
-       deUint32                        maxPerStageDescriptorStorageImages;
-       deUint32                        maxPerStageDescriptorInputAttachments;
-       deUint32                        maxPerStageResources;
-       deUint32                        maxDescriptorSetSamplers;
-       deUint32                        maxDescriptorSetUniformBuffers;
-       deUint32                        maxDescriptorSetUniformBuffersDynamic;
-       deUint32                        maxDescriptorSetStorageBuffers;
-       deUint32                        maxDescriptorSetStorageBuffersDynamic;
-       deUint32                        maxDescriptorSetSampledImages;
-       deUint32                        maxDescriptorSetStorageImages;
-       deUint32                        maxDescriptorSetInputAttachments;
-       deUint32                        maxVertexInputAttributes;
-       deUint32                        maxVertexInputBindings;
-       deUint32                        maxVertexInputAttributeOffset;
-       deUint32                        maxVertexInputBindingStride;
-       deUint32                        maxVertexOutputComponents;
-       deUint32                        maxTessellationGenerationLevel;
-       deUint32                        maxTessellationPatchSize;
-       deUint32                        maxTessellationControlPerVertexInputComponents;
-       deUint32                        maxTessellationControlPerVertexOutputComponents;
-       deUint32                        maxTessellationControlPerPatchOutputComponents;
-       deUint32                        maxTessellationControlTotalOutputComponents;
-       deUint32                        maxTessellationEvaluationInputComponents;
-       deUint32                        maxTessellationEvaluationOutputComponents;
-       deUint32                        maxGeometryShaderInvocations;
-       deUint32                        maxGeometryInputComponents;
-       deUint32                        maxGeometryOutputComponents;
-       deUint32                        maxGeometryOutputVertices;
-       deUint32                        maxGeometryTotalOutputComponents;
-       deUint32                        maxFragmentInputComponents;
-       deUint32                        maxFragmentOutputAttachments;
-       deUint32                        maxFragmentDualSrcAttachments;
-       deUint32                        maxFragmentCombinedOutputResources;
-       deUint32                        maxComputeSharedMemorySize;
-       deUint32                        maxComputeWorkGroupCount[3];
-       deUint32                        maxComputeWorkGroupInvocations;
-       deUint32                        maxComputeWorkGroupSize[3];
-       deUint32                        subPixelPrecisionBits;
-       deUint32                        subTexelPrecisionBits;
-       deUint32                        mipmapPrecisionBits;
-       deUint32                        maxDrawIndexedIndexValue;
-       deUint32                        maxDrawIndirectCount;
+       uint32_t                        maxBoundDescriptorSets;
+       uint32_t                        maxPerStageDescriptorSamplers;
+       uint32_t                        maxPerStageDescriptorUniformBuffers;
+       uint32_t                        maxPerStageDescriptorStorageBuffers;
+       uint32_t                        maxPerStageDescriptorSampledImages;
+       uint32_t                        maxPerStageDescriptorStorageImages;
+       uint32_t                        maxPerStageDescriptorInputAttachments;
+       uint32_t                        maxPerStageResources;
+       uint32_t                        maxDescriptorSetSamplers;
+       uint32_t                        maxDescriptorSetUniformBuffers;
+       uint32_t                        maxDescriptorSetUniformBuffersDynamic;
+       uint32_t                        maxDescriptorSetStorageBuffers;
+       uint32_t                        maxDescriptorSetStorageBuffersDynamic;
+       uint32_t                        maxDescriptorSetSampledImages;
+       uint32_t                        maxDescriptorSetStorageImages;
+       uint32_t                        maxDescriptorSetInputAttachments;
+       uint32_t                        maxVertexInputAttributes;
+       uint32_t                        maxVertexInputBindings;
+       uint32_t                        maxVertexInputAttributeOffset;
+       uint32_t                        maxVertexInputBindingStride;
+       uint32_t                        maxVertexOutputComponents;
+       uint32_t                        maxTessellationGenerationLevel;
+       uint32_t                        maxTessellationPatchSize;
+       uint32_t                        maxTessellationControlPerVertexInputComponents;
+       uint32_t                        maxTessellationControlPerVertexOutputComponents;
+       uint32_t                        maxTessellationControlPerPatchOutputComponents;
+       uint32_t                        maxTessellationControlTotalOutputComponents;
+       uint32_t                        maxTessellationEvaluationInputComponents;
+       uint32_t                        maxTessellationEvaluationOutputComponents;
+       uint32_t                        maxGeometryShaderInvocations;
+       uint32_t                        maxGeometryInputComponents;
+       uint32_t                        maxGeometryOutputComponents;
+       uint32_t                        maxGeometryOutputVertices;
+       uint32_t                        maxGeometryTotalOutputComponents;
+       uint32_t                        maxFragmentInputComponents;
+       uint32_t                        maxFragmentOutputAttachments;
+       uint32_t                        maxFragmentDualSrcAttachments;
+       uint32_t                        maxFragmentCombinedOutputResources;
+       uint32_t                        maxComputeSharedMemorySize;
+       uint32_t                        maxComputeWorkGroupCount[3];
+       uint32_t                        maxComputeWorkGroupInvocations;
+       uint32_t                        maxComputeWorkGroupSize[3];
+       uint32_t                        subPixelPrecisionBits;
+       uint32_t                        subTexelPrecisionBits;
+       uint32_t                        mipmapPrecisionBits;
+       uint32_t                        maxDrawIndexedIndexValue;
+       uint32_t                        maxDrawIndirectCount;
        float                           maxSamplerLodBias;
        float                           maxSamplerAnisotropy;
-       deUint32                        maxViewports;
-       deUint32                        maxViewportDimensions[2];
+       uint32_t                        maxViewports;
+       uint32_t                        maxViewportDimensions[2];
        float                           viewportBoundsRange[2];
-       deUint32                        viewportSubPixelBits;
+       uint32_t                        viewportSubPixelBits;
        deUintptr                       minMemoryMapAlignment;
        VkDeviceSize            minTexelBufferOffsetAlignment;
        VkDeviceSize            minUniformBufferOffsetAlignment;
        VkDeviceSize            minStorageBufferOffsetAlignment;
-       deInt32                         minTexelOffset;
-       deUint32                        maxTexelOffset;
-       deInt32                         minTexelGatherOffset;
-       deUint32                        maxTexelGatherOffset;
+       int32_t                         minTexelOffset;
+       uint32_t                        maxTexelOffset;
+       int32_t                         minTexelGatherOffset;
+       uint32_t                        maxTexelGatherOffset;
        float                           minInterpolationOffset;
        float                           maxInterpolationOffset;
-       deUint32                        subPixelInterpolationOffsetBits;
-       deUint32                        maxFramebufferWidth;
-       deUint32                        maxFramebufferHeight;
-       deUint32                        maxFramebufferLayers;
+       uint32_t                        subPixelInterpolationOffsetBits;
+       uint32_t                        maxFramebufferWidth;
+       uint32_t                        maxFramebufferHeight;
+       uint32_t                        maxFramebufferLayers;
        VkSampleCountFlags      framebufferColorSampleCounts;
        VkSampleCountFlags      framebufferDepthSampleCounts;
        VkSampleCountFlags      framebufferStencilSampleCounts;
        VkSampleCountFlags      framebufferNoAttachmentsSampleCounts;
-       deUint32                        maxColorAttachments;
+       uint32_t                        maxColorAttachments;
        VkSampleCountFlags      sampledImageColorSampleCounts;
        VkSampleCountFlags      sampledImageIntegerSampleCounts;
        VkSampleCountFlags      sampledImageDepthSampleCounts;
        VkSampleCountFlags      sampledImageStencilSampleCounts;
        VkSampleCountFlags      storageImageSampleCounts;
-       deUint32                        maxSampleMaskWords;
+       uint32_t                        maxSampleMaskWords;
        VkBool32                        timestampComputeAndGraphics;
        float                           timestampPeriod;
-       deUint32                        maxClipDistances;
-       deUint32                        maxCullDistances;
-       deUint32                        maxCombinedClipAndCullDistances;
-       deUint32                        discreteQueuePriorities;
+       uint32_t                        maxClipDistances;
+       uint32_t                        maxCullDistances;
+       uint32_t                        maxCombinedClipAndCullDistances;
+       uint32_t                        discreteQueuePriorities;
        float                           pointSizeRange[2];
        float                           lineWidthRange[2];
        float                           pointSizeGranularity;
@@ -354,9 +354,9 @@ struct VkPhysicalDeviceLimits
 
 struct VkPhysicalDeviceMemoryProperties
 {
-       deUint32                memoryTypeCount;
+       uint32_t                memoryTypeCount;
        VkMemoryType    memoryTypes[VK_MAX_MEMORY_TYPES];
-       deUint32                memoryHeapCount;
+       uint32_t                memoryHeapCount;
        VkMemoryHeap    memoryHeaps[VK_MAX_MEMORY_HEAPS];
 };
 
@@ -371,10 +371,10 @@ struct VkPhysicalDeviceSparseProperties
 
 struct VkPhysicalDeviceProperties
 {
-       deUint32                                                        apiVersion;
-       deUint32                                                        driverVersion;
-       deUint32                                                        vendorID;
-       deUint32                                                        deviceID;
+       uint32_t                                                        apiVersion;
+       uint32_t                                                        driverVersion;
+       uint32_t                                                        vendorID;
+       uint32_t                                                        deviceID;
        VkPhysicalDeviceType                            deviceType;
        char                                                            deviceName[VK_MAX_PHYSICAL_DEVICE_NAME_SIZE];
        deUint8                                                         pipelineCacheUUID[VK_UUID_SIZE];
@@ -385,8 +385,8 @@ struct VkPhysicalDeviceProperties
 struct VkQueueFamilyProperties
 {
        VkQueueFlags    queueFlags;
-       deUint32                queueCount;
-       deUint32                timestampValidBits;
+       uint32_t                queueCount;
+       uint32_t                timestampValidBits;
        VkExtent3D              minImageTransferGranularity;
 };
 
@@ -395,8 +395,8 @@ struct VkDeviceQueueCreateInfo
        VkStructureType                         sType;
        const void*                                     pNext;
        VkDeviceQueueCreateFlags        flags;
-       deUint32                                        queueFamilyIndex;
-       deUint32                                        queueCount;
+       uint32_t                                        queueFamilyIndex;
+       uint32_t                                        queueCount;
        const float*                            pQueuePriorities;
 };
 
@@ -405,11 +405,11 @@ struct VkDeviceCreateInfo
        VkStructureType                                 sType;
        const void*                                             pNext;
        VkDeviceCreateFlags                             flags;
-       deUint32                                                queueCreateInfoCount;
+       uint32_t                                                queueCreateInfoCount;
        const VkDeviceQueueCreateInfo*  pQueueCreateInfos;
-       deUint32                                                enabledLayerCount;
+       uint32_t                                                enabledLayerCount;
        const char* const*                              ppEnabledLayerNames;
-       deUint32                                                enabledExtensionCount;
+       uint32_t                                                enabledExtensionCount;
        const char* const*                              ppEnabledExtensionNames;
        const VkPhysicalDeviceFeatures* pEnabledFeatures;
 };
@@ -417,14 +417,14 @@ struct VkDeviceCreateInfo
 struct VkExtensionProperties
 {
        char            extensionName[VK_MAX_EXTENSION_NAME_SIZE];
-       deUint32        specVersion;
+       uint32_t        specVersion;
 };
 
 struct VkLayerProperties
 {
        char            layerName[VK_MAX_EXTENSION_NAME_SIZE];
-       deUint32        specVersion;
-       deUint32        implementationVersion;
+       uint32_t        specVersion;
+       uint32_t        implementationVersion;
        char            description[VK_MAX_DESCRIPTION_SIZE];
 };
 
@@ -432,12 +432,12 @@ struct VkSubmitInfo
 {
        VkStructureType                         sType;
        const void*                                     pNext;
-       deUint32                                        waitSemaphoreCount;
+       uint32_t                                        waitSemaphoreCount;
        const VkSemaphore*                      pWaitSemaphores;
        const VkPipelineStageFlags*     pWaitDstStageMask;
-       deUint32                                        commandBufferCount;
+       uint32_t                                        commandBufferCount;
        const VkCommandBuffer*          pCommandBuffers;
-       deUint32                                        signalSemaphoreCount;
+       uint32_t                                        signalSemaphoreCount;
        const VkSemaphore*                      pSignalSemaphores;
 };
 
@@ -455,14 +455,14 @@ struct VkMemoryAllocateInfo
        VkStructureType sType;
        const void*             pNext;
        VkDeviceSize    allocationSize;
-       deUint32                memoryTypeIndex;
+       uint32_t                memoryTypeIndex;
 };
 
 struct VkMemoryRequirements
 {
        VkDeviceSize    size;
        VkDeviceSize    alignment;
-       deUint32                memoryTypeBits;
+       uint32_t                memoryTypeBits;
 };
 
 struct VkSparseMemoryBind
@@ -477,22 +477,22 @@ struct VkSparseMemoryBind
 struct VkSparseBufferMemoryBindInfo
 {
        VkBuffer                                        buffer;
-       deUint32                                        bindCount;
+       uint32_t                                        bindCount;
        const VkSparseMemoryBind*       pBinds;
 };
 
 struct VkSparseImageOpaqueMemoryBindInfo
 {
        VkImage                                         image;
-       deUint32                                        bindCount;
+       uint32_t                                        bindCount;
        const VkSparseMemoryBind*       pBinds;
 };
 
 struct VkImageSubresource
 {
        VkImageAspectFlags      aspectMask;
-       deUint32                        mipLevel;
-       deUint32                        arrayLayer;
+       uint32_t                        mipLevel;
+       uint32_t                        arrayLayer;
 };
 
 struct VkSparseImageMemoryBind
@@ -508,7 +508,7 @@ struct VkSparseImageMemoryBind
 struct VkSparseImageMemoryBindInfo
 {
        VkImage                                                 image;
-       deUint32                                                bindCount;
+       uint32_t                                                bindCount;
        const VkSparseImageMemoryBind*  pBinds;
 };
 
@@ -516,15 +516,15 @@ struct VkBindSparseInfo
 {
        VkStructureType                                                         sType;
        const void*                                                                     pNext;
-       deUint32                                                                        waitSemaphoreCount;
+       uint32_t                                                                        waitSemaphoreCount;
        const VkSemaphore*                                                      pWaitSemaphores;
-       deUint32                                                                        bufferBindCount;
+       uint32_t                                                                        bufferBindCount;
        const VkSparseBufferMemoryBindInfo*                     pBufferBinds;
-       deUint32                                                                        imageOpaqueBindCount;
+       uint32_t                                                                        imageOpaqueBindCount;
        const VkSparseImageOpaqueMemoryBindInfo*        pImageOpaqueBinds;
-       deUint32                                                                        imageBindCount;
+       uint32_t                                                                        imageBindCount;
        const VkSparseImageMemoryBindInfo*                      pImageBinds;
-       deUint32                                                                        signalSemaphoreCount;
+       uint32_t                                                                        signalSemaphoreCount;
        const VkSemaphore*                                                      pSignalSemaphores;
 };
 
@@ -538,7 +538,7 @@ struct VkSparseImageFormatProperties
 struct VkSparseImageMemoryRequirements
 {
        VkSparseImageFormatProperties   formatProperties;
-       deUint32                                                imageMipTailFirstLod;
+       uint32_t                                                imageMipTailFirstLod;
        VkDeviceSize                                    imageMipTailSize;
        VkDeviceSize                                    imageMipTailOffset;
        VkDeviceSize                                    imageMipTailStride;
@@ -571,7 +571,7 @@ struct VkQueryPoolCreateInfo
        const void*                                             pNext;
        VkQueryPoolCreateFlags                  flags;
        VkQueryType                                             queryType;
-       deUint32                                                queryCount;
+       uint32_t                                                queryCount;
        VkQueryPipelineStatisticFlags   pipelineStatistics;
 };
 
@@ -583,8 +583,8 @@ struct VkBufferCreateInfo
        VkDeviceSize            size;
        VkBufferUsageFlags      usage;
        VkSharingMode           sharingMode;
-       deUint32                        queueFamilyIndexCount;
-       const deUint32*         pQueueFamilyIndices;
+       uint32_t                        queueFamilyIndexCount;
+       const uint32_t*         pQueueFamilyIndices;
 };
 
 struct VkBufferViewCreateInfo
@@ -606,14 +606,14 @@ struct VkImageCreateInfo
        VkImageType                             imageType;
        VkFormat                                format;
        VkExtent3D                              extent;
-       deUint32                                mipLevels;
-       deUint32                                arrayLayers;
+       uint32_t                                mipLevels;
+       uint32_t                                arrayLayers;
        VkSampleCountFlagBits   samples;
        VkImageTiling                   tiling;
        VkImageUsageFlags               usage;
        VkSharingMode                   sharingMode;
-       deUint32                                queueFamilyIndexCount;
-       const deUint32*                 pQueueFamilyIndices;
+       uint32_t                                queueFamilyIndexCount;
+       const uint32_t*                 pQueueFamilyIndices;
        VkImageLayout                   initialLayout;
 };
 
@@ -652,7 +652,7 @@ struct VkShaderModuleCreateInfo
        const void*                                     pNext;
        VkShaderModuleCreateFlags       flags;
        deUintptr                                       codeSize;
-       const deUint32*                         pCode;
+       const uint32_t*                         pCode;
 };
 
 struct VkPipelineCacheCreateInfo
@@ -666,14 +666,14 @@ struct VkPipelineCacheCreateInfo
 
 struct VkSpecializationMapEntry
 {
-       deUint32        constantID;
-       deUint32        offset;
+       uint32_t        constantID;
+       uint32_t        offset;
        deUintptr       size;
 };
 
 struct VkSpecializationInfo
 {
-       deUint32                                                mapEntryCount;
+       uint32_t                                                mapEntryCount;
        const VkSpecializationMapEntry* pMapEntries;
        deUintptr                                               dataSize;
        const void*                                             pData;
@@ -698,22 +698,22 @@ struct VkComputePipelineCreateInfo
        VkPipelineShaderStageCreateInfo stage;
        VkPipelineLayout                                layout;
        VkPipeline                                              basePipelineHandle;
-       deInt32                                                 basePipelineIndex;
+       int32_t                                                 basePipelineIndex;
 };
 
 struct VkVertexInputBindingDescription
 {
-       deUint32                        binding;
-       deUint32                        stride;
+       uint32_t                        binding;
+       uint32_t                        stride;
        VkVertexInputRate       inputRate;
 };
 
 struct VkVertexInputAttributeDescription
 {
-       deUint32        location;
-       deUint32        binding;
+       uint32_t        location;
+       uint32_t        binding;
        VkFormat        format;
-       deUint32        offset;
+       uint32_t        offset;
 };
 
 struct VkPipelineVertexInputStateCreateInfo
@@ -721,9 +721,9 @@ struct VkPipelineVertexInputStateCreateInfo
        VkStructureType                                                         sType;
        const void*                                                                     pNext;
        VkPipelineVertexInputStateCreateFlags           flags;
-       deUint32                                                                        vertexBindingDescriptionCount;
+       uint32_t                                                                        vertexBindingDescriptionCount;
        const VkVertexInputBindingDescription*          pVertexBindingDescriptions;
-       deUint32                                                                        vertexAttributeDescriptionCount;
+       uint32_t                                                                        vertexAttributeDescriptionCount;
        const VkVertexInputAttributeDescription*        pVertexAttributeDescriptions;
 };
 
@@ -741,7 +741,7 @@ struct VkPipelineTessellationStateCreateInfo
        VkStructureType                                                 sType;
        const void*                                                             pNext;
        VkPipelineTessellationStateCreateFlags  flags;
-       deUint32                                                                patchControlPoints;
+       uint32_t                                                                patchControlPoints;
 };
 
 struct VkViewport
@@ -759,9 +759,9 @@ struct VkPipelineViewportStateCreateInfo
        VkStructureType                                         sType;
        const void*                                                     pNext;
        VkPipelineViewportStateCreateFlags      flags;
-       deUint32                                                        viewportCount;
+       uint32_t                                                        viewportCount;
        const VkViewport*                                       pViewports;
-       deUint32                                                        scissorCount;
+       uint32_t                                                        scissorCount;
        const VkRect2D*                                         pScissors;
 };
 
@@ -801,9 +801,9 @@ struct VkStencilOpState
        VkStencilOp     passOp;
        VkStencilOp     depthFailOp;
        VkCompareOp     compareOp;
-       deUint32        compareMask;
-       deUint32        writeMask;
-       deUint32        reference;
+       uint32_t        compareMask;
+       uint32_t        writeMask;
+       uint32_t        reference;
 };
 
 struct VkPipelineDepthStencilStateCreateInfo
@@ -841,7 +841,7 @@ struct VkPipelineColorBlendStateCreateInfo
        VkPipelineColorBlendStateCreateFlags            flags;
        VkBool32                                                                        logicOpEnable;
        VkLogicOp                                                                       logicOp;
-       deUint32                                                                        attachmentCount;
+       uint32_t                                                                        attachmentCount;
        const VkPipelineColorBlendAttachmentState*      pAttachments;
        float                                                                           blendConstants[4];
 };
@@ -851,7 +851,7 @@ struct VkPipelineDynamicStateCreateInfo
        VkStructureType                                         sType;
        const void*                                                     pNext;
        VkPipelineDynamicStateCreateFlags       flags;
-       deUint32                                                        dynamicStateCount;
+       uint32_t                                                        dynamicStateCount;
        const VkDynamicState*                           pDynamicStates;
 };
 
@@ -860,7 +860,7 @@ struct VkGraphicsPipelineCreateInfo
        VkStructureType                                                                 sType;
        const void*                                                                             pNext;
        VkPipelineCreateFlags                                                   flags;
-       deUint32                                                                                stageCount;
+       uint32_t                                                                                stageCount;
        const VkPipelineShaderStageCreateInfo*                  pStages;
        const VkPipelineVertexInputStateCreateInfo*             pVertexInputState;
        const VkPipelineInputAssemblyStateCreateInfo*   pInputAssemblyState;
@@ -873,16 +873,16 @@ struct VkGraphicsPipelineCreateInfo
        const VkPipelineDynamicStateCreateInfo*                 pDynamicState;
        VkPipelineLayout                                                                layout;
        VkRenderPass                                                                    renderPass;
-       deUint32                                                                                subpass;
+       uint32_t                                                                                subpass;
        VkPipeline                                                                              basePipelineHandle;
-       deInt32                                                                                 basePipelineIndex;
+       int32_t                                                                                 basePipelineIndex;
 };
 
 struct VkPushConstantRange
 {
        VkShaderStageFlags      stageFlags;
-       deUint32                        offset;
-       deUint32                        size;
+       uint32_t                        offset;
+       uint32_t                        size;
 };
 
 struct VkPipelineLayoutCreateInfo
@@ -890,9 +890,9 @@ struct VkPipelineLayoutCreateInfo
        VkStructureType                                 sType;
        const void*                                             pNext;
        VkPipelineLayoutCreateFlags             flags;
-       deUint32                                                setLayoutCount;
+       uint32_t                                                setLayoutCount;
        const VkDescriptorSetLayout*    pSetLayouts;
-       deUint32                                                pushConstantRangeCount;
+       uint32_t                                                pushConstantRangeCount;
        const VkPushConstantRange*              pPushConstantRanges;
 };
 
@@ -923,12 +923,12 @@ struct VkCopyDescriptorSet
        VkStructureType sType;
        const void*             pNext;
        VkDescriptorSet srcSet;
-       deUint32                srcBinding;
-       deUint32                srcArrayElement;
+       uint32_t                srcBinding;
+       uint32_t                srcArrayElement;
        VkDescriptorSet dstSet;
-       deUint32                dstBinding;
-       deUint32                dstArrayElement;
-       deUint32                descriptorCount;
+       uint32_t                dstBinding;
+       uint32_t                dstArrayElement;
+       uint32_t                descriptorCount;
 };
 
 struct VkDescriptorBufferInfo
@@ -948,7 +948,7 @@ struct VkDescriptorImageInfo
 struct VkDescriptorPoolSize
 {
        VkDescriptorType        type;
-       deUint32                        descriptorCount;
+       uint32_t                        descriptorCount;
 };
 
 struct VkDescriptorPoolCreateInfo
@@ -956,8 +956,8 @@ struct VkDescriptorPoolCreateInfo
        VkStructureType                         sType;
        const void*                                     pNext;
        VkDescriptorPoolCreateFlags     flags;
-       deUint32                                        maxSets;
-       deUint32                                        poolSizeCount;
+       uint32_t                                        maxSets;
+       uint32_t                                        poolSizeCount;
        const VkDescriptorPoolSize*     pPoolSizes;
 };
 
@@ -966,15 +966,15 @@ struct VkDescriptorSetAllocateInfo
        VkStructureType                                 sType;
        const void*                                             pNext;
        VkDescriptorPool                                descriptorPool;
-       deUint32                                                descriptorSetCount;
+       uint32_t                                                descriptorSetCount;
        const VkDescriptorSetLayout*    pSetLayouts;
 };
 
 struct VkDescriptorSetLayoutBinding
 {
-       deUint32                        binding;
+       uint32_t                        binding;
        VkDescriptorType        descriptorType;
-       deUint32                        descriptorCount;
+       uint32_t                        descriptorCount;
        VkShaderStageFlags      stageFlags;
        const VkSampler*        pImmutableSamplers;
 };
@@ -984,7 +984,7 @@ struct VkDescriptorSetLayoutCreateInfo
        VkStructureType                                         sType;
        const void*                                                     pNext;
        VkDescriptorSetLayoutCreateFlags        flags;
-       deUint32                                                        bindingCount;
+       uint32_t                                                        bindingCount;
        const VkDescriptorSetLayoutBinding*     pBindings;
 };
 
@@ -993,9 +993,9 @@ struct VkWriteDescriptorSet
        VkStructureType                                 sType;
        const void*                                             pNext;
        VkDescriptorSet                                 dstSet;
-       deUint32                                                dstBinding;
-       deUint32                                                dstArrayElement;
-       deUint32                                                descriptorCount;
+       uint32_t                                                dstBinding;
+       uint32_t                                                dstArrayElement;
+       uint32_t                                                descriptorCount;
        VkDescriptorType                                descriptorType;
        const VkDescriptorImageInfo*    pImageInfo;
        const VkDescriptorBufferInfo*   pBufferInfo;
@@ -1017,7 +1017,7 @@ struct VkAttachmentDescription
 
 struct VkAttachmentReference
 {
-       deUint32                attachment;
+       uint32_t                attachment;
        VkImageLayout   layout;
 };
 
@@ -1027,31 +1027,31 @@ struct VkFramebufferCreateInfo
        const void*                                     pNext;
        VkFramebufferCreateFlags        flags;
        VkRenderPass                            renderPass;
-       deUint32                                        attachmentCount;
+       uint32_t                                        attachmentCount;
        const VkImageView*                      pAttachments;
-       deUint32                                        width;
-       deUint32                                        height;
-       deUint32                                        layers;
+       uint32_t                                        width;
+       uint32_t                                        height;
+       uint32_t                                        layers;
 };
 
 struct VkSubpassDescription
 {
        VkSubpassDescriptionFlags               flags;
        VkPipelineBindPoint                             pipelineBindPoint;
-       deUint32                                                inputAttachmentCount;
+       uint32_t                                                inputAttachmentCount;
        const VkAttachmentReference*    pInputAttachments;
-       deUint32                                                colorAttachmentCount;
+       uint32_t                                                colorAttachmentCount;
        const VkAttachmentReference*    pColorAttachments;
        const VkAttachmentReference*    pResolveAttachments;
        const VkAttachmentReference*    pDepthStencilAttachment;
-       deUint32                                                preserveAttachmentCount;
-       const deUint32*                                 pPreserveAttachments;
+       uint32_t                                                preserveAttachmentCount;
+       const uint32_t*                                 pPreserveAttachments;
 };
 
 struct VkSubpassDependency
 {
-       deUint32                                srcSubpass;
-       deUint32                                dstSubpass;
+       uint32_t                                srcSubpass;
+       uint32_t                                dstSubpass;
        VkPipelineStageFlags    srcStageMask;
        VkPipelineStageFlags    dstStageMask;
        VkAccessFlags                   srcAccessMask;
@@ -1064,11 +1064,11 @@ struct VkRenderPassCreateInfo
        VkStructureType                                 sType;
        const void*                                             pNext;
        VkRenderPassCreateFlags                 flags;
-       deUint32                                                attachmentCount;
+       uint32_t                                                attachmentCount;
        const VkAttachmentDescription*  pAttachments;
-       deUint32                                                subpassCount;
+       uint32_t                                                subpassCount;
        const VkSubpassDescription*             pSubpasses;
-       deUint32                                                dependencyCount;
+       uint32_t                                                dependencyCount;
        const VkSubpassDependency*              pDependencies;
 };
 
@@ -1077,7 +1077,7 @@ struct VkCommandPoolCreateInfo
        VkStructureType                         sType;
        const void*                                     pNext;
        VkCommandPoolCreateFlags        flags;
-       deUint32                                        queueFamilyIndex;
+       uint32_t                                        queueFamilyIndex;
 };
 
 struct VkCommandBufferAllocateInfo
@@ -1086,7 +1086,7 @@ struct VkCommandBufferAllocateInfo
        const void*                             pNext;
        VkCommandPool                   commandPool;
        VkCommandBufferLevel    level;
-       deUint32                                commandBufferCount;
+       uint32_t                                commandBufferCount;
 };
 
 struct VkCommandBufferInheritanceInfo
@@ -1094,7 +1094,7 @@ struct VkCommandBufferInheritanceInfo
        VkStructureType                                 sType;
        const void*                                             pNext;
        VkRenderPass                                    renderPass;
-       deUint32                                                subpass;
+       uint32_t                                                subpass;
        VkFramebuffer                                   framebuffer;
        VkBool32                                                occlusionQueryEnable;
        VkQueryControlFlags                             queryFlags;
@@ -1119,16 +1119,16 @@ struct VkBufferCopy
 struct VkImageSubresourceLayers
 {
        VkImageAspectFlags      aspectMask;
-       deUint32                        mipLevel;
-       deUint32                        baseArrayLayer;
-       deUint32                        layerCount;
+       uint32_t                        mipLevel;
+       uint32_t                        baseArrayLayer;
+       uint32_t                        layerCount;
 };
 
 struct VkBufferImageCopy
 {
        VkDeviceSize                            bufferOffset;
-       deUint32                                        bufferRowLength;
-       deUint32                                        bufferImageHeight;
+       uint32_t                                        bufferRowLength;
+       uint32_t                                        bufferImageHeight;
        VkImageSubresourceLayers        imageSubresource;
        VkOffset3D                                      imageOffset;
        VkExtent3D                                      imageExtent;
@@ -1137,14 +1137,14 @@ struct VkBufferImageCopy
 union VkClearColorValue
 {
        float           float32[4];
-       deInt32         int32[4];
-       deUint32        uint32[4];
+       int32_t         int32[4];
+       uint32_t        uint32[4];
 };
 
 struct VkClearDepthStencilValue
 {
        float           depth;
-       deUint32        stencil;
+       uint32_t        stencil;
 };
 
 union VkClearValue
@@ -1156,15 +1156,15 @@ union VkClearValue
 struct VkClearAttachment
 {
        VkImageAspectFlags      aspectMask;
-       deUint32                        colorAttachment;
+       uint32_t                        colorAttachment;
        VkClearValue            clearValue;
 };
 
 struct VkClearRect
 {
        VkRect2D        rect;
-       deUint32        baseArrayLayer;
-       deUint32        layerCount;
+       uint32_t        baseArrayLayer;
+       uint32_t        layerCount;
 };
 
 struct VkImageBlit
@@ -1200,7 +1200,7 @@ struct VkRenderPassBeginInfo
        VkRenderPass            renderPass;
        VkFramebuffer           framebuffer;
        VkRect2D                        renderArea;
-       deUint32                        clearValueCount;
+       uint32_t                        clearValueCount;
        const VkClearValue*     pClearValues;
 };
 
@@ -1208,7 +1208,7 @@ struct VkPhysicalDeviceSubgroupProperties
 {
        VkStructureType                 sType;
        void*                                   pNext;
-       deUint32                                subgroupSize;
+       uint32_t                                subgroupSize;
        VkShaderStageFlags              supportedStages;
        VkSubgroupFeatureFlags  supportedOperations;
        VkBool32                                quadOperationsInAllStages;
@@ -1263,15 +1263,15 @@ struct VkMemoryAllocateFlagsInfo
        VkStructureType                 sType;
        const void*                             pNext;
        VkMemoryAllocateFlags   flags;
-       deUint32                                deviceMask;
+       uint32_t                                deviceMask;
 };
 
 struct VkDeviceGroupRenderPassBeginInfo
 {
        VkStructureType sType;
        const void*             pNext;
-       deUint32                deviceMask;
-       deUint32                deviceRenderAreaCount;
+       uint32_t                deviceMask;
+       uint32_t                deviceRenderAreaCount;
        const VkRect2D* pDeviceRenderAreas;
 };
 
@@ -1279,44 +1279,44 @@ struct VkDeviceGroupCommandBufferBeginInfo
 {
        VkStructureType sType;
        const void*             pNext;
-       deUint32                deviceMask;
+       uint32_t                deviceMask;
 };
 
 struct VkDeviceGroupSubmitInfo
 {
        VkStructureType sType;
        const void*             pNext;
-       deUint32                waitSemaphoreCount;
-       const deUint32* pWaitSemaphoreDeviceIndices;
-       deUint32                commandBufferCount;
-       const deUint32* pCommandBufferDeviceMasks;
-       deUint32                signalSemaphoreCount;
-       const deUint32* pSignalSemaphoreDeviceIndices;
+       uint32_t                waitSemaphoreCount;
+       const uint32_t* pWaitSemaphoreDeviceIndices;
+       uint32_t                commandBufferCount;
+       const uint32_t* pCommandBufferDeviceMasks;
+       uint32_t                signalSemaphoreCount;
+       const uint32_t* pSignalSemaphoreDeviceIndices;
 };
 
 struct VkDeviceGroupBindSparseInfo
 {
        VkStructureType sType;
        const void*             pNext;
-       deUint32                resourceDeviceIndex;
-       deUint32                memoryDeviceIndex;
+       uint32_t                resourceDeviceIndex;
+       uint32_t                memoryDeviceIndex;
 };
 
 struct VkBindBufferMemoryDeviceGroupInfo
 {
        VkStructureType sType;
        const void*             pNext;
-       deUint32                deviceIndexCount;
-       const deUint32* pDeviceIndices;
+       uint32_t                deviceIndexCount;
+       const uint32_t* pDeviceIndices;
 };
 
 struct VkBindImageMemoryDeviceGroupInfo
 {
        VkStructureType sType;
        const void*             pNext;
-       deUint32                deviceIndexCount;
-       const deUint32* pDeviceIndices;
-       deUint32                splitInstanceBindRegionCount;
+       uint32_t                deviceIndexCount;
+       const uint32_t* pDeviceIndices;
+       uint32_t                splitInstanceBindRegionCount;
        const VkRect2D* pSplitInstanceBindRegions;
 };
 
@@ -1324,7 +1324,7 @@ struct VkPhysicalDeviceGroupProperties
 {
        VkStructureType         sType;
        void*                           pNext;
-       deUint32                        physicalDeviceCount;
+       uint32_t                        physicalDeviceCount;
        VkPhysicalDevice        physicalDevices[VK_MAX_DEVICE_GROUP_SIZE];
        VkBool32                        subsetAllocation;
 };
@@ -1333,7 +1333,7 @@ struct VkDeviceGroupDeviceCreateInfo
 {
        VkStructureType                 sType;
        const void*                             pNext;
-       deUint32                                physicalDeviceCount;
+       uint32_t                                physicalDeviceCount;
        const VkPhysicalDevice* pPhysicalDevices;
 };
 
@@ -1452,8 +1452,8 @@ struct VkPhysicalDevicePointClippingProperties
 
 struct VkInputAttachmentAspectReference
 {
-       deUint32                        subpass;
-       deUint32                        inputAttachmentIndex;
+       uint32_t                        subpass;
+       uint32_t                        inputAttachmentIndex;
        VkImageAspectFlags      aspectMask;
 };
 
@@ -1461,7 +1461,7 @@ struct VkRenderPassInputAttachmentAspectCreateInfo
 {
        VkStructureType                                                 sType;
        const void*                                                             pNext;
-       deUint32                                                                aspectReferenceCount;
+       uint32_t                                                                aspectReferenceCount;
        const VkInputAttachmentAspectReference* pAspectReferences;
 };
 
@@ -1483,12 +1483,12 @@ struct VkRenderPassMultiviewCreateInfo
 {
        VkStructureType sType;
        const void*             pNext;
-       deUint32                subpassCount;
-       const deUint32* pViewMasks;
-       deUint32                dependencyCount;
-       const deInt32*  pViewOffsets;
-       deUint32                correlationMaskCount;
-       const deUint32* pCorrelationMasks;
+       uint32_t                subpassCount;
+       const uint32_t* pViewMasks;
+       uint32_t                dependencyCount;
+       const int32_t*  pViewOffsets;
+       uint32_t                correlationMaskCount;
+       const uint32_t* pCorrelationMasks;
 };
 
 struct VkPhysicalDeviceMultiviewFeatures
@@ -1504,8 +1504,8 @@ struct VkPhysicalDeviceMultiviewProperties
 {
        VkStructureType sType;
        void*                   pNext;
-       deUint32                maxMultiviewViewCount;
-       deUint32                maxMultiviewInstanceIndex;
+       uint32_t                maxMultiviewViewCount;
+       uint32_t                maxMultiviewInstanceIndex;
 };
 
 struct VkPhysicalDeviceVariablePointersFeatures
@@ -1535,8 +1535,8 @@ struct VkDeviceQueueInfo2
        VkStructureType                         sType;
        const void*                                     pNext;
        VkDeviceQueueCreateFlags        flags;
-       deUint32                                        queueFamilyIndex;
-       deUint32                                        queueIndex;
+       uint32_t                                        queueFamilyIndex;
+       uint32_t                                        queueIndex;
 };
 
 struct VkProtectedSubmitInfo
@@ -1592,14 +1592,14 @@ struct VkSamplerYcbcrConversionImageFormatProperties
 {
        VkStructureType sType;
        void*                   pNext;
-       deUint32                combinedImageSamplerDescriptorCount;
+       uint32_t                combinedImageSamplerDescriptorCount;
 };
 
 struct VkDescriptorUpdateTemplateEntry
 {
-       deUint32                        dstBinding;
-       deUint32                        dstArrayElement;
-       deUint32                        descriptorCount;
+       uint32_t                        dstBinding;
+       uint32_t                        dstArrayElement;
+       uint32_t                        descriptorCount;
        VkDescriptorType        descriptorType;
        deUintptr                       offset;
        deUintptr                       stride;
@@ -1610,13 +1610,13 @@ struct VkDescriptorUpdateTemplateCreateInfo
        VkStructureType                                                 sType;
        const void*                                                             pNext;
        VkDescriptorUpdateTemplateCreateFlags   flags;
-       deUint32                                                                descriptorUpdateEntryCount;
+       uint32_t                                                                descriptorUpdateEntryCount;
        const VkDescriptorUpdateTemplateEntry*  pDescriptorUpdateEntries;
        VkDescriptorUpdateTemplateType                  templateType;
        VkDescriptorSetLayout                                   descriptorSetLayout;
        VkPipelineBindPoint                                             pipelineBindPoint;
        VkPipelineLayout                                                pipelineLayout;
-       deUint32                                                                set;
+       uint32_t                                                                set;
 };
 
 struct VkExternalMemoryProperties
@@ -1663,7 +1663,7 @@ struct VkPhysicalDeviceIDProperties
        deUint8                 deviceUUID[VK_UUID_SIZE];
        deUint8                 driverUUID[VK_UUID_SIZE];
        deUint8                 deviceLUID[VK_LUID_SIZE];
-       deUint32                deviceNodeMask;
+       uint32_t                deviceNodeMask;
        VkBool32                deviceLUIDValid;
 };
 
@@ -1738,7 +1738,7 @@ struct VkPhysicalDeviceMaintenance3Properties
 {
        VkStructureType sType;
        void*                   pNext;
-       deUint32                maxPerSetDescriptors;
+       uint32_t                maxPerSetDescriptors;
        VkDeviceSize    maxMemoryAllocationSize;
 };
 
@@ -1781,17 +1781,17 @@ struct VkPhysicalDeviceVulkan11Properties
        deUint8                                 deviceUUID[VK_UUID_SIZE];
        deUint8                                 driverUUID[VK_UUID_SIZE];
        deUint8                                 deviceLUID[VK_LUID_SIZE];
-       deUint32                                deviceNodeMask;
+       uint32_t                                deviceNodeMask;
        VkBool32                                deviceLUIDValid;
-       deUint32                                subgroupSize;
+       uint32_t                                subgroupSize;
        VkShaderStageFlags              subgroupSupportedStages;
        VkSubgroupFeatureFlags  subgroupSupportedOperations;
        VkBool32                                subgroupQuadOperationsInAllStages;
        VkPointClippingBehavior pointClippingBehavior;
-       deUint32                                maxMultiviewViewCount;
-       deUint32                                maxMultiviewInstanceIndex;
+       uint32_t                                maxMultiviewViewCount;
+       uint32_t                                maxMultiviewInstanceIndex;
        VkBool32                                protectedNoFault;
-       deUint32                                maxPerSetDescriptors;
+       uint32_t                                maxPerSetDescriptors;
        VkDeviceSize                    maxMemoryAllocationSize;
 };
 
@@ -1881,7 +1881,7 @@ struct VkPhysicalDeviceVulkan12Properties
        VkBool32                                                        shaderRoundingModeRTZFloat16;
        VkBool32                                                        shaderRoundingModeRTZFloat32;
        VkBool32                                                        shaderRoundingModeRTZFloat64;
-       deUint32                                                        maxUpdateAfterBindDescriptorsInAllPools;
+       uint32_t                                                        maxUpdateAfterBindDescriptorsInAllPools;
        VkBool32                                                        shaderUniformBufferArrayNonUniformIndexingNative;
        VkBool32                                                        shaderSampledImageArrayNonUniformIndexingNative;
        VkBool32                                                        shaderStorageBufferArrayNonUniformIndexingNative;
@@ -1889,21 +1889,21 @@ struct VkPhysicalDeviceVulkan12Properties
        VkBool32                                                        shaderInputAttachmentArrayNonUniformIndexingNative;
        VkBool32                                                        robustBufferAccessUpdateAfterBind;
        VkBool32                                                        quadDivergentImplicitLod;
-       deUint32                                                        maxPerStageDescriptorUpdateAfterBindSamplers;
-       deUint32                                                        maxPerStageDescriptorUpdateAfterBindUniformBuffers;
-       deUint32                                                        maxPerStageDescriptorUpdateAfterBindStorageBuffers;
-       deUint32                                                        maxPerStageDescriptorUpdateAfterBindSampledImages;
-       deUint32                                                        maxPerStageDescriptorUpdateAfterBindStorageImages;
-       deUint32                                                        maxPerStageDescriptorUpdateAfterBindInputAttachments;
-       deUint32                                                        maxPerStageUpdateAfterBindResources;
-       deUint32                                                        maxDescriptorSetUpdateAfterBindSamplers;
-       deUint32                                                        maxDescriptorSetUpdateAfterBindUniformBuffers;
-       deUint32                                                        maxDescriptorSetUpdateAfterBindUniformBuffersDynamic;
-       deUint32                                                        maxDescriptorSetUpdateAfterBindStorageBuffers;
-       deUint32                                                        maxDescriptorSetUpdateAfterBindStorageBuffersDynamic;
-       deUint32                                                        maxDescriptorSetUpdateAfterBindSampledImages;
-       deUint32                                                        maxDescriptorSetUpdateAfterBindStorageImages;
-       deUint32                                                        maxDescriptorSetUpdateAfterBindInputAttachments;
+       uint32_t                                                        maxPerStageDescriptorUpdateAfterBindSamplers;
+       uint32_t                                                        maxPerStageDescriptorUpdateAfterBindUniformBuffers;
+       uint32_t                                                        maxPerStageDescriptorUpdateAfterBindStorageBuffers;
+       uint32_t                                                        maxPerStageDescriptorUpdateAfterBindSampledImages;
+       uint32_t                                                        maxPerStageDescriptorUpdateAfterBindStorageImages;
+       uint32_t                                                        maxPerStageDescriptorUpdateAfterBindInputAttachments;
+       uint32_t                                                        maxPerStageUpdateAfterBindResources;
+       uint32_t                                                        maxDescriptorSetUpdateAfterBindSamplers;
+       uint32_t                                                        maxDescriptorSetUpdateAfterBindUniformBuffers;
+       uint32_t                                                        maxDescriptorSetUpdateAfterBindUniformBuffersDynamic;
+       uint32_t                                                        maxDescriptorSetUpdateAfterBindStorageBuffers;
+       uint32_t                                                        maxDescriptorSetUpdateAfterBindStorageBuffersDynamic;
+       uint32_t                                                        maxDescriptorSetUpdateAfterBindSampledImages;
+       uint32_t                                                        maxDescriptorSetUpdateAfterBindStorageImages;
+       uint32_t                                                        maxDescriptorSetUpdateAfterBindInputAttachments;
        VkResolveModeFlags                                      supportedDepthResolveModes;
        VkResolveModeFlags                                      supportedStencilResolveModes;
        VkBool32                                                        independentResolveNone;
@@ -1918,7 +1918,7 @@ struct VkImageFormatListCreateInfo
 {
        VkStructureType sType;
        const void*             pNext;
-       deUint32                viewFormatCount;
+       uint32_t                viewFormatCount;
        const VkFormat* pViewFormats;
 };
 
@@ -1941,7 +1941,7 @@ struct VkAttachmentReference2
 {
        VkStructureType         sType;
        const void*                     pNext;
-       deUint32                        attachment;
+       uint32_t                        attachment;
        VkImageLayout           layout;
        VkImageAspectFlags      aspectMask;
 };
@@ -1952,29 +1952,29 @@ struct VkSubpassDescription2
        const void*                                             pNext;
        VkSubpassDescriptionFlags               flags;
        VkPipelineBindPoint                             pipelineBindPoint;
-       deUint32                                                viewMask;
-       deUint32                                                inputAttachmentCount;
+       uint32_t                                                viewMask;
+       uint32_t                                                inputAttachmentCount;
        const VkAttachmentReference2*   pInputAttachments;
-       deUint32                                                colorAttachmentCount;
+       uint32_t                                                colorAttachmentCount;
        const VkAttachmentReference2*   pColorAttachments;
        const VkAttachmentReference2*   pResolveAttachments;
        const VkAttachmentReference2*   pDepthStencilAttachment;
-       deUint32                                                preserveAttachmentCount;
-       const deUint32*                                 pPreserveAttachments;
+       uint32_t                                                preserveAttachmentCount;
+       const uint32_t*                                 pPreserveAttachments;
 };
 
 struct VkSubpassDependency2
 {
        VkStructureType                 sType;
        const void*                             pNext;
-       deUint32                                srcSubpass;
-       deUint32                                dstSubpass;
+       uint32_t                                srcSubpass;
+       uint32_t                                dstSubpass;
        VkPipelineStageFlags    srcStageMask;
        VkPipelineStageFlags    dstStageMask;
        VkAccessFlags                   srcAccessMask;
        VkAccessFlags                   dstAccessMask;
        VkDependencyFlags               dependencyFlags;
-       deInt32                                 viewOffset;
+       int32_t                                 viewOffset;
 };
 
 struct VkRenderPassCreateInfo2
@@ -1982,14 +1982,14 @@ struct VkRenderPassCreateInfo2
        VkStructureType                                 sType;
        const void*                                             pNext;
        VkRenderPassCreateFlags                 flags;
-       deUint32                                                attachmentCount;
+       uint32_t                                                attachmentCount;
        const VkAttachmentDescription2* pAttachments;
-       deUint32                                                subpassCount;
+       uint32_t                                                subpassCount;
        const VkSubpassDescription2*    pSubpasses;
-       deUint32                                                dependencyCount;
+       uint32_t                                                dependencyCount;
        const VkSubpassDependency2*             pDependencies;
-       deUint32                                                correlatedViewMaskCount;
-       const deUint32*                                 pCorrelatedViewMasks;
+       uint32_t                                                correlatedViewMaskCount;
+       const uint32_t*                                 pCorrelatedViewMasks;
 };
 
 struct VkSubpassBeginInfo
@@ -2067,7 +2067,7 @@ struct VkDescriptorSetLayoutBindingFlagsCreateInfo
 {
        VkStructureType                                 sType;
        const void*                                             pNext;
-       deUint32                                                bindingCount;
+       uint32_t                                                bindingCount;
        const VkDescriptorBindingFlags* pBindingFlags;
 };
 
@@ -2101,7 +2101,7 @@ struct VkPhysicalDeviceDescriptorIndexingProperties
 {
        VkStructureType sType;
        void*                   pNext;
-       deUint32                maxUpdateAfterBindDescriptorsInAllPools;
+       uint32_t                maxUpdateAfterBindDescriptorsInAllPools;
        VkBool32                shaderUniformBufferArrayNonUniformIndexingNative;
        VkBool32                shaderSampledImageArrayNonUniformIndexingNative;
        VkBool32                shaderStorageBufferArrayNonUniformIndexingNative;
@@ -2109,36 +2109,36 @@ struct VkPhysicalDeviceDescriptorIndexingProperties
        VkBool32                shaderInputAttachmentArrayNonUniformIndexingNative;
        VkBool32                robustBufferAccessUpdateAfterBind;
        VkBool32                quadDivergentImplicitLod;
-       deUint32                maxPerStageDescriptorUpdateAfterBindSamplers;
-       deUint32                maxPerStageDescriptorUpdateAfterBindUniformBuffers;
-       deUint32                maxPerStageDescriptorUpdateAfterBindStorageBuffers;
-       deUint32                maxPerStageDescriptorUpdateAfterBindSampledImages;
-       deUint32                maxPerStageDescriptorUpdateAfterBindStorageImages;
-       deUint32                maxPerStageDescriptorUpdateAfterBindInputAttachments;
-       deUint32                maxPerStageUpdateAfterBindResources;
-       deUint32                maxDescriptorSetUpdateAfterBindSamplers;
-       deUint32                maxDescriptorSetUpdateAfterBindUniformBuffers;
-       deUint32                maxDescriptorSetUpdateAfterBindUniformBuffersDynamic;
-       deUint32                maxDescriptorSetUpdateAfterBindStorageBuffers;
-       deUint32                maxDescriptorSetUpdateAfterBindStorageBuffersDynamic;
-       deUint32                maxDescriptorSetUpdateAfterBindSampledImages;
-       deUint32                maxDescriptorSetUpdateAfterBindStorageImages;
-       deUint32                maxDescriptorSetUpdateAfterBindInputAttachments;
+       uint32_t                maxPerStageDescriptorUpdateAfterBindSamplers;
+       uint32_t                maxPerStageDescriptorUpdateAfterBindUniformBuffers;
+       uint32_t                maxPerStageDescriptorUpdateAfterBindStorageBuffers;
+       uint32_t                maxPerStageDescriptorUpdateAfterBindSampledImages;
+       uint32_t                maxPerStageDescriptorUpdateAfterBindStorageImages;
+       uint32_t                maxPerStageDescriptorUpdateAfterBindInputAttachments;
+       uint32_t                maxPerStageUpdateAfterBindResources;
+       uint32_t                maxDescriptorSetUpdateAfterBindSamplers;
+       uint32_t                maxDescriptorSetUpdateAfterBindUniformBuffers;
+       uint32_t                maxDescriptorSetUpdateAfterBindUniformBuffersDynamic;
+       uint32_t                maxDescriptorSetUpdateAfterBindStorageBuffers;
+       uint32_t                maxDescriptorSetUpdateAfterBindStorageBuffersDynamic;
+       uint32_t                maxDescriptorSetUpdateAfterBindSampledImages;
+       uint32_t                maxDescriptorSetUpdateAfterBindStorageImages;
+       uint32_t                maxDescriptorSetUpdateAfterBindInputAttachments;
 };
 
 struct VkDescriptorSetVariableDescriptorCountAllocateInfo
 {
        VkStructureType sType;
        const void*             pNext;
-       deUint32                descriptorSetCount;
-       const deUint32* pDescriptorCounts;
+       uint32_t                descriptorSetCount;
+       const uint32_t* pDescriptorCounts;
 };
 
 struct VkDescriptorSetVariableDescriptorCountLayoutSupport
 {
        VkStructureType sType;
        void*                   pNext;
-       deUint32                maxVariableDescriptorCount;
+       uint32_t                maxVariableDescriptorCount;
 };
 
 struct VkSubpassDescriptionDepthStencilResolve
@@ -2211,10 +2211,10 @@ struct VkFramebufferAttachmentImageInfo
        const void*                     pNext;
        VkImageCreateFlags      flags;
        VkImageUsageFlags       usage;
-       deUint32                        width;
-       deUint32                        height;
-       deUint32                        layerCount;
-       deUint32                        viewFormatCount;
+       uint32_t                        width;
+       uint32_t                        height;
+       uint32_t                        layerCount;
+       uint32_t                        viewFormatCount;
        const VkFormat*         pViewFormats;
 };
 
@@ -2222,7 +2222,7 @@ struct VkFramebufferAttachmentsCreateInfo
 {
        VkStructureType                                                 sType;
        const void*                                                             pNext;
-       deUint32                                                                attachmentImageInfoCount;
+       uint32_t                                                                attachmentImageInfoCount;
        const VkFramebufferAttachmentImageInfo* pAttachmentImageInfos;
 };
 
@@ -2230,7 +2230,7 @@ struct VkRenderPassAttachmentBeginInfo
 {
        VkStructureType         sType;
        const void*                     pNext;
-       deUint32                        attachmentCount;
+       uint32_t                        attachmentCount;
        const VkImageView*      pAttachments;
 };
 
@@ -2303,9 +2303,9 @@ struct VkTimelineSemaphoreSubmitInfo
 {
        VkStructureType sType;
        const void*             pNext;
-       deUint32                waitSemaphoreValueCount;
+       uint32_t                waitSemaphoreValueCount;
        const deUint64* pWaitSemaphoreValues;
-       deUint32                signalSemaphoreValueCount;
+       uint32_t                signalSemaphoreValueCount;
        const deUint64* pSignalSemaphoreValues;
 };
 
@@ -2314,7 +2314,7 @@ struct VkSemaphoreWaitInfo
        VkStructureType                 sType;
        const void*                             pNext;
        VkSemaphoreWaitFlags    flags;
-       deUint32                                semaphoreCount;
+       uint32_t                                semaphoreCount;
        const VkSemaphore*              pSemaphores;
        const deUint64*                 pValues;
 };
@@ -2366,12 +2366,12 @@ struct VkDeviceMemoryOpaqueCaptureAddressInfo
 
 struct VkSurfaceCapabilitiesKHR
 {
-       deUint32                                                minImageCount;
-       deUint32                                                maxImageCount;
+       uint32_t                                                minImageCount;
+       uint32_t                                                maxImageCount;
        VkExtent2D                                              currentExtent;
        VkExtent2D                                              minImageExtent;
        VkExtent2D                                              maxImageExtent;
-       deUint32                                                maxImageArrayLayers;
+       uint32_t                                                maxImageArrayLayers;
        VkSurfaceTransformFlagsKHR              supportedTransforms;
        VkSurfaceTransformFlagBitsKHR   currentTransform;
        VkCompositeAlphaFlagsKHR                supportedCompositeAlpha;
@@ -2390,15 +2390,15 @@ struct VkSwapchainCreateInfoKHR
        const void*                                             pNext;
        VkSwapchainCreateFlagsKHR               flags;
        VkSurfaceKHR                                    surface;
-       deUint32                                                minImageCount;
+       uint32_t                                                minImageCount;
        VkFormat                                                imageFormat;
        VkColorSpaceKHR                                 imageColorSpace;
        VkExtent2D                                              imageExtent;
-       deUint32                                                imageArrayLayers;
+       uint32_t                                                imageArrayLayers;
        VkImageUsageFlags                               imageUsage;
        VkSharingMode                                   imageSharingMode;
-       deUint32                                                queueFamilyIndexCount;
-       const deUint32*                                 pQueueFamilyIndices;
+       uint32_t                                                queueFamilyIndexCount;
+       const uint32_t*                                 pQueueFamilyIndices;
        VkSurfaceTransformFlagBitsKHR   preTransform;
        VkCompositeAlphaFlagBitsKHR             compositeAlpha;
        VkPresentModeKHR                                presentMode;
@@ -2410,11 +2410,11 @@ struct VkPresentInfoKHR
 {
        VkStructureType                 sType;
        const void*                             pNext;
-       deUint32                                waitSemaphoreCount;
+       uint32_t                                waitSemaphoreCount;
        const VkSemaphore*              pWaitSemaphores;
-       deUint32                                swapchainCount;
+       uint32_t                                swapchainCount;
        const VkSwapchainKHR*   pSwapchains;
-       const deUint32*                 pImageIndices;
+       const uint32_t*                 pImageIndices;
        VkResult*                               pResults;
 };
 
@@ -2430,7 +2430,7 @@ struct VkBindImageMemorySwapchainInfoKHR
        VkStructureType sType;
        const void*             pNext;
        VkSwapchainKHR  swapchain;
-       deUint32                imageIndex;
+       uint32_t                imageIndex;
 };
 
 struct VkAcquireNextImageInfoKHR
@@ -2441,14 +2441,14 @@ struct VkAcquireNextImageInfoKHR
        deUint64                timeout;
        VkSemaphore             semaphore;
        VkFence                 fence;
-       deUint32                deviceMask;
+       uint32_t                deviceMask;
 };
 
 struct VkDeviceGroupPresentCapabilitiesKHR
 {
        VkStructureType                                         sType;
        void*                                                           pNext;
-       deUint32                                                        presentMask[VK_MAX_DEVICE_GROUP_SIZE];
+       uint32_t                                                        presentMask[VK_MAX_DEVICE_GROUP_SIZE];
        VkDeviceGroupPresentModeFlagsKHR        modes;
 };
 
@@ -2456,8 +2456,8 @@ struct VkDeviceGroupPresentInfoKHR
 {
        VkStructureType                                         sType;
        const void*                                                     pNext;
-       deUint32                                                        swapchainCount;
-       const deUint32*                                         pDeviceMasks;
+       uint32_t                                                        swapchainCount;
+       const uint32_t*                                         pDeviceMasks;
        VkDeviceGroupPresentModeFlagBitsKHR     mode;
 };
 
@@ -2471,7 +2471,7 @@ struct VkDeviceGroupSwapchainCreateInfoKHR
 struct VkDisplayModeParametersKHR
 {
        VkExtent2D      visibleRegion;
-       deUint32        refreshRate;
+       uint32_t        refreshRate;
 };
 
 struct VkDisplayModeCreateInfoKHR
@@ -2504,7 +2504,7 @@ struct VkDisplayPlaneCapabilitiesKHR
 struct VkDisplayPlanePropertiesKHR
 {
        VkDisplayKHR    currentDisplay;
-       deUint32                currentStackIndex;
+       uint32_t                currentStackIndex;
 };
 
 struct VkDisplayPropertiesKHR
@@ -2524,8 +2524,8 @@ struct VkDisplaySurfaceCreateInfoKHR
        const void*                                             pNext;
        VkDisplaySurfaceCreateFlagsKHR  flags;
        VkDisplayModeKHR                                displayMode;
-       deUint32                                                planeIndex;
-       deUint32                                                planeStackIndex;
+       uint32_t                                                planeIndex;
+       uint32_t                                                planeStackIndex;
        VkSurfaceTransformFlagBitsKHR   transform;
        float                                                   globalAlpha;
        VkDisplayPlaneAlphaFlagBitsKHR  alphaMode;
@@ -2553,7 +2553,7 @@ struct VkMemoryFdPropertiesKHR
 {
        VkStructureType sType;
        void*                   pNext;
-       deUint32                memoryTypeBits;
+       uint32_t                memoryTypeBits;
 };
 
 struct VkMemoryGetFdInfoKHR
@@ -2586,19 +2586,19 @@ struct VkPhysicalDevicePushDescriptorPropertiesKHR
 {
        VkStructureType sType;
        void*                   pNext;
-       deUint32                maxPushDescriptors;
+       uint32_t                maxPushDescriptors;
 };
 
 struct VkRectLayerKHR
 {
        VkOffset2D      offset;
        VkExtent2D      extent;
-       deUint32        layer;
+       uint32_t        layer;
 };
 
 struct VkPresentRegionKHR
 {
-       deUint32                                rectangleCount;
+       uint32_t                                rectangleCount;
        const VkRectLayerKHR*   pRectangles;
 };
 
@@ -2606,7 +2606,7 @@ struct VkPresentRegionsKHR
 {
        VkStructureType                         sType;
        const void*                                     pNext;
-       deUint32                                        swapchainCount;
+       uint32_t                                        swapchainCount;
        const VkPresentRegionKHR*       pRegions;
 };
 
@@ -2674,16 +2674,16 @@ struct VkQueryPoolPerformanceCreateInfoKHR
 {
        VkStructureType sType;
        const void*             pNext;
-       deUint32                queueFamilyIndex;
-       deUint32                counterIndexCount;
-       const deUint32* pCounterIndices;
+       uint32_t                queueFamilyIndex;
+       uint32_t                counterIndexCount;
+       const uint32_t* pCounterIndices;
 };
 
 union VkPerformanceCounterResultKHR
 {
-       deInt32         int32;
+       int32_t         int32;
        deInt64         int64;
-       deUint32        uint32;
+       uint32_t        uint32;
        deUint64        uint64;
        float           float32;
        double          float64;
@@ -2701,7 +2701,7 @@ struct VkPerformanceQuerySubmitInfoKHR
 {
        VkStructureType sType;
        const void*             pNext;
-       deUint32                counterPassIndex;
+       uint32_t                counterPassIndex;
 };
 
 struct VkPhysicalDeviceSurfaceInfo2KHR
@@ -2751,7 +2751,7 @@ struct VkDisplayPlaneInfo2KHR
        VkStructureType         sType;
        const void*                     pNext;
        VkDisplayModeKHR        mode;
-       deUint32                        planeIndex;
+       uint32_t                        planeIndex;
 };
 
 struct VkDisplayPlaneCapabilities2KHR
@@ -2807,13 +2807,13 @@ struct VkPhysicalDeviceFragmentShadingRatePropertiesKHR
        void*                                   pNext;
        VkExtent2D                              minFragmentShadingRateAttachmentTexelSize;
        VkExtent2D                              maxFragmentShadingRateAttachmentTexelSize;
-       deUint32                                maxFragmentShadingRateAttachmentTexelSizeAspectRatio;
+       uint32_t                                maxFragmentShadingRateAttachmentTexelSizeAspectRatio;
        VkBool32                                primitiveFragmentShadingRateWithMultipleViewports;
        VkBool32                                layeredShadingRateAttachments;
        VkBool32                                fragmentShadingRateNonTrivialCombinerOps;
        VkExtent2D                              maxFragmentSize;
-       deUint32                                maxFragmentSizeAspectRatio;
-       deUint32                                maxFragmentShadingRateCoverageSamples;
+       uint32_t                                maxFragmentSizeAspectRatio;
+       uint32_t                                maxFragmentShadingRateCoverageSamples;
        VkSampleCountFlagBits   maxFragmentShadingRateRasterizationSamples;
        VkBool32                                fragmentShadingRateWithShaderDepthStencilWrites;
        VkBool32                                fragmentShadingRateWithSampleMask;
@@ -2860,7 +2860,7 @@ struct VkPipelineExecutablePropertiesKHR
        VkShaderStageFlags      stages;
        char                            name[VK_MAX_DESCRIPTION_SIZE];
        char                            description[VK_MAX_DESCRIPTION_SIZE];
-       deUint32                        subgroupSize;
+       uint32_t                        subgroupSize;
 };
 
 struct VkPipelineExecutableInfoKHR
@@ -2868,7 +2868,7 @@ struct VkPipelineExecutableInfoKHR
        VkStructureType sType;
        const void*             pNext;
        VkPipeline              pipeline;
-       deUint32                executableIndex;
+       uint32_t                executableIndex;
 };
 
 union VkPipelineExecutableStatisticValueKHR
@@ -2904,7 +2904,7 @@ struct VkPipelineLibraryCreateInfoKHR
 {
        VkStructureType         sType;
        const void*                     pNext;
-       deUint32                        libraryCount;
+       uint32_t                        libraryCount;
        const VkPipeline*       pLibraries;
 };
 
@@ -2926,8 +2926,8 @@ struct VkBufferMemoryBarrier2KHR
        VkAccessFlags2KHR                       srcAccessMask;
        VkPipelineStageFlags2KHR        dstStageMask;
        VkAccessFlags2KHR                       dstAccessMask;
-       deUint32                                        srcQueueFamilyIndex;
-       deUint32                                        dstQueueFamilyIndex;
+       uint32_t                                        srcQueueFamilyIndex;
+       uint32_t                                        dstQueueFamilyIndex;
        VkBuffer                                        buffer;
        VkDeviceSize                            offset;
        VkDeviceSize                            size;
@@ -2943,8 +2943,8 @@ struct VkImageMemoryBarrier2KHR
        VkAccessFlags2KHR                       dstAccessMask;
        VkImageLayout                           oldLayout;
        VkImageLayout                           newLayout;
-       deUint32                                        srcQueueFamilyIndex;
-       deUint32                                        dstQueueFamilyIndex;
+       uint32_t                                        srcQueueFamilyIndex;
+       uint32_t                                        dstQueueFamilyIndex;
        VkImage                                         image;
        VkImageSubresourceRange         subresourceRange;
 };
@@ -2954,11 +2954,11 @@ struct VkDependencyInfoKHR
        VkStructureType                                         sType;
        const void*                                                     pNext;
        VkDependencyFlags                                       dependencyFlags;
-       deUint32                                                        memoryBarrierCount;
+       uint32_t                                                        memoryBarrierCount;
        const VkMemoryBarrier2KHR*                      pMemoryBarriers;
-       deUint32                                                        bufferMemoryBarrierCount;
+       uint32_t                                                        bufferMemoryBarrierCount;
        const VkBufferMemoryBarrier2KHR*        pBufferMemoryBarriers;
-       deUint32                                                        imageMemoryBarrierCount;
+       uint32_t                                                        imageMemoryBarrierCount;
        const VkImageMemoryBarrier2KHR*         pImageMemoryBarriers;
 };
 
@@ -2969,7 +2969,7 @@ struct VkSemaphoreSubmitInfoKHR
        VkSemaphore                                     semaphore;
        deUint64                                        value;
        VkPipelineStageFlags2KHR        stageMask;
-       deUint32                                        deviceIndex;
+       uint32_t                                        deviceIndex;
 };
 
 struct VkCommandBufferSubmitInfoKHR
@@ -2977,7 +2977,7 @@ struct VkCommandBufferSubmitInfoKHR
        VkStructureType sType;
        const void*             pNext;
        VkCommandBuffer commandBuffer;
-       deUint32                deviceMask;
+       uint32_t                deviceMask;
 };
 
 struct VkSubmitInfo2KHR
@@ -2985,11 +2985,11 @@ struct VkSubmitInfo2KHR
        VkStructureType                                         sType;
        const void*                                                     pNext;
        VkSubmitFlagsKHR                                        flags;
-       deUint32                                                        waitSemaphoreInfoCount;
+       uint32_t                                                        waitSemaphoreInfoCount;
        const VkSemaphoreSubmitInfoKHR*         pWaitSemaphoreInfos;
-       deUint32                                                        commandBufferInfoCount;
+       uint32_t                                                        commandBufferInfoCount;
        const VkCommandBufferSubmitInfoKHR*     pCommandBufferInfos;
-       deUint32                                                        signalSemaphoreInfoCount;
+       uint32_t                                                        signalSemaphoreInfoCount;
        const VkSemaphoreSubmitInfoKHR*         pSignalSemaphoreInfos;
 };
 
@@ -3054,7 +3054,7 @@ struct VkCopyBufferInfo2KHR
        const void*                             pNext;
        VkBuffer                                srcBuffer;
        VkBuffer                                dstBuffer;
-       deUint32                                regionCount;
+       uint32_t                                regionCount;
        const VkBufferCopy2KHR* pRegions;
 };
 
@@ -3077,7 +3077,7 @@ struct VkCopyImageInfo2KHR
        VkImageLayout                   srcImageLayout;
        VkImage                                 dstImage;
        VkImageLayout                   dstImageLayout;
-       deUint32                                regionCount;
+       uint32_t                                regionCount;
        const VkImageCopy2KHR*  pRegions;
 };
 
@@ -3086,8 +3086,8 @@ struct VkBufferImageCopy2KHR
        VkStructureType                         sType;
        const void*                                     pNext;
        VkDeviceSize                            bufferOffset;
-       deUint32                                        bufferRowLength;
-       deUint32                                        bufferImageHeight;
+       uint32_t                                        bufferRowLength;
+       uint32_t                                        bufferImageHeight;
        VkImageSubresourceLayers        imageSubresource;
        VkOffset3D                                      imageOffset;
        VkExtent3D                                      imageExtent;
@@ -3100,7 +3100,7 @@ struct VkCopyBufferToImageInfo2KHR
        VkBuffer                                                srcBuffer;
        VkImage                                                 dstImage;
        VkImageLayout                                   dstImageLayout;
-       deUint32                                                regionCount;
+       uint32_t                                                regionCount;
        const VkBufferImageCopy2KHR*    pRegions;
 };
 
@@ -3111,7 +3111,7 @@ struct VkCopyImageToBufferInfo2KHR
        VkImage                                                 srcImage;
        VkImageLayout                                   srcImageLayout;
        VkBuffer                                                dstBuffer;
-       deUint32                                                regionCount;
+       uint32_t                                                regionCount;
        const VkBufferImageCopy2KHR*    pRegions;
 };
 
@@ -3133,7 +3133,7 @@ struct VkBlitImageInfo2KHR
        VkImageLayout                   srcImageLayout;
        VkImage                                 dstImage;
        VkImageLayout                   dstImageLayout;
-       deUint32                                regionCount;
+       uint32_t                                regionCount;
        const VkImageBlit2KHR*  pRegions;
        VkFilter                                filter;
 };
@@ -3157,7 +3157,7 @@ struct VkResolveImageInfo2KHR
        VkImageLayout                           srcImageLayout;
        VkImage                                         dstImage;
        VkImageLayout                           dstImageLayout;
-       deUint32                                        regionCount;
+       uint32_t                                        regionCount;
        const VkImageResolve2KHR*       pRegions;
 };
 
@@ -3239,12 +3239,12 @@ struct VkPhysicalDeviceTransformFeedbackPropertiesEXT
 {
        VkStructureType sType;
        void*                   pNext;
-       deUint32                maxTransformFeedbackStreams;
-       deUint32                maxTransformFeedbackBuffers;
+       uint32_t                maxTransformFeedbackStreams;
+       uint32_t                maxTransformFeedbackBuffers;
        VkDeviceSize    maxTransformFeedbackBufferSize;
-       deUint32                maxTransformFeedbackStreamDataSize;
-       deUint32                maxTransformFeedbackBufferDataSize;
-       deUint32                maxTransformFeedbackBufferDataStride;
+       uint32_t                maxTransformFeedbackStreamDataSize;
+       uint32_t                maxTransformFeedbackBufferDataSize;
+       uint32_t                maxTransformFeedbackBufferDataStride;
        VkBool32                transformFeedbackQueries;
        VkBool32                transformFeedbackStreamsLinesTriangles;
        VkBool32                transformFeedbackRasterizationStreamSelect;
@@ -3256,7 +3256,7 @@ struct VkPipelineRasterizationStateStreamCreateInfoEXT
        VkStructureType                                                                         sType;
        const void*                                                                                     pNext;
        VkPipelineRasterizationStateStreamCreateFlagsEXT        flags;
-       deUint32                                                                                        rasterizationStream;
+       uint32_t                                                                                        rasterizationStream;
 };
 
 struct VkCuModuleCreateInfoNVX
@@ -3280,13 +3280,13 @@ struct VkCuLaunchInfoNVX
        VkStructureType         sType;
        const void*                     pNext;
        VkCuFunctionNVX         function;
-       deUint32                        gridDimX;
-       deUint32                        gridDimY;
-       deUint32                        gridDimZ;
-       deUint32                        blockDimX;
-       deUint32                        blockDimY;
-       deUint32                        blockDimZ;
-       deUint32                        sharedMemBytes;
+       uint32_t                        gridDimX;
+       uint32_t                        gridDimY;
+       uint32_t                        gridDimZ;
+       uint32_t                        blockDimX;
+       uint32_t                        blockDimY;
+       uint32_t                        blockDimZ;
+       uint32_t                        sharedMemBytes;
        deUintptr                       paramCount;
        const void* const *     pParams;
        deUintptr                       extraCount;
@@ -3319,9 +3319,9 @@ struct VkTextureLODGatherFormatPropertiesAMD
 
 struct VkShaderResourceUsageAMD
 {
-       deUint32        numUsedVgprs;
-       deUint32        numUsedSgprs;
-       deUint32        ldsSizePerLocalWorkGroup;
+       uint32_t        numUsedVgprs;
+       uint32_t        numUsedSgprs;
+       uint32_t        ldsSizePerLocalWorkGroup;
        deUintptr       ldsUsageSizeInBytes;
        deUintptr       scratchMemUsageInBytes;
 };
@@ -3330,11 +3330,11 @@ struct VkShaderStatisticsInfoAMD
 {
        VkShaderStageFlags                      shaderStageMask;
        VkShaderResourceUsageAMD        resourceUsage;
-       deUint32                                        numPhysicalVgprs;
-       deUint32                                        numPhysicalSgprs;
-       deUint32                                        numAvailableVgprs;
-       deUint32                                        numAvailableSgprs;
-       deUint32                                        computeWorkGroupSize[3];
+       uint32_t                                        numPhysicalVgprs;
+       uint32_t                                        numPhysicalSgprs;
+       uint32_t                                        numAvailableVgprs;
+       uint32_t                                        numAvailableSgprs;
+       uint32_t                                        computeWorkGroupSize[3];
 };
 
 struct VkPhysicalDeviceCornerSampledImageFeaturesNV
@@ -3370,7 +3370,7 @@ struct VkValidationFlagsEXT
 {
        VkStructureType                         sType;
        const void*                                     pNext;
-       deUint32                                        disabledValidationCheckCount;
+       uint32_t                                        disabledValidationCheckCount;
        const VkValidationCheckEXT*     pDisabledValidationChecks;
 };
 
@@ -3430,7 +3430,7 @@ struct VkPipelineViewportWScalingStateCreateInfoNV
        VkStructureType                         sType;
        const void*                                     pNext;
        VkBool32                                        viewportWScalingEnable;
-       deUint32                                        viewportCount;
+       uint32_t                                        viewportCount;
        const VkViewportWScalingNV*     pViewportWScalings;
 };
 
@@ -3438,12 +3438,12 @@ struct VkSurfaceCapabilities2EXT
 {
        VkStructureType                                 sType;
        void*                                                   pNext;
-       deUint32                                                minImageCount;
-       deUint32                                                maxImageCount;
+       uint32_t                                                minImageCount;
+       uint32_t                                                maxImageCount;
        VkExtent2D                                              currentExtent;
        VkExtent2D                                              minImageExtent;
        VkExtent2D                                              maxImageExtent;
-       deUint32                                                maxImageArrayLayers;
+       uint32_t                                                maxImageArrayLayers;
        VkSurfaceTransformFlagsKHR              supportedTransforms;
        VkSurfaceTransformFlagBitsKHR   currentTransform;
        VkCompositeAlphaFlagsKHR                supportedCompositeAlpha;
@@ -3486,7 +3486,7 @@ struct VkRefreshCycleDurationGOOGLE
 
 struct VkPastPresentationTimingGOOGLE
 {
-       deUint32        presentID;
+       uint32_t        presentID;
        deUint64        desiredPresentTime;
        deUint64        actualPresentTime;
        deUint64        earliestPresentTime;
@@ -3495,7 +3495,7 @@ struct VkPastPresentationTimingGOOGLE
 
 struct VkPresentTimeGOOGLE
 {
-       deUint32        presentID;
+       uint32_t        presentID;
        deUint64        desiredPresentTime;
 };
 
@@ -3503,7 +3503,7 @@ struct VkPresentTimesInfoGOOGLE
 {
        VkStructureType                         sType;
        const void*                                     pNext;
-       deUint32                                        swapchainCount;
+       uint32_t                                        swapchainCount;
        const VkPresentTimeGOOGLE*      pTimes;
 };
 
@@ -3527,7 +3527,7 @@ struct VkPipelineViewportSwizzleStateCreateInfoNV
        VkStructureType                                                         sType;
        const void*                                                                     pNext;
        VkPipelineViewportSwizzleStateCreateFlagsNV     flags;
-       deUint32                                                                        viewportCount;
+       uint32_t                                                                        viewportCount;
        const VkViewportSwizzleNV*                                      pViewportSwizzles;
 };
 
@@ -3535,7 +3535,7 @@ struct VkPhysicalDeviceDiscardRectanglePropertiesEXT
 {
        VkStructureType sType;
        void*                   pNext;
-       deUint32                maxDiscardRectangles;
+       uint32_t                maxDiscardRectangles;
 };
 
 struct VkPipelineDiscardRectangleStateCreateInfoEXT
@@ -3544,7 +3544,7 @@ struct VkPipelineDiscardRectangleStateCreateInfoEXT
        const void*                                                                             pNext;
        VkPipelineDiscardRectangleStateCreateFlagsEXT   flags;
        VkDiscardRectangleModeEXT                                               discardRectangleMode;
-       deUint32                                                                                discardRectangleCount;
+       uint32_t                                                                                discardRectangleCount;
        const VkRect2D*                                                                 pDiscardRectangles;
 };
 
@@ -3630,13 +3630,13 @@ struct VkDebugUtilsMessengerCallbackDataEXT
        const void*                                                                     pNext;
        VkDebugUtilsMessengerCallbackDataFlagsEXT       flags;
        const char*                                                                     pMessageIdName;
-       deInt32                                                                         messageIdNumber;
+       int32_t                                                                         messageIdNumber;
        const char*                                                                     pMessage;
-       deUint32                                                                        queueLabelCount;
+       uint32_t                                                                        queueLabelCount;
        const VkDebugUtilsLabelEXT*                                     pQueueLabels;
-       deUint32                                                                        cmdBufLabelCount;
+       uint32_t                                                                        cmdBufLabelCount;
        const VkDebugUtilsLabelEXT*                                     pCmdBufLabels;
-       deUint32                                                                        objectCount;
+       uint32_t                                                                        objectCount;
        const VkDebugUtilsObjectNameInfoEXT*            pObjects;
 };
 
@@ -3674,18 +3674,18 @@ struct VkPhysicalDeviceInlineUniformBlockPropertiesEXT
 {
        VkStructureType sType;
        void*                   pNext;
-       deUint32                maxInlineUniformBlockSize;
-       deUint32                maxPerStageDescriptorInlineUniformBlocks;
-       deUint32                maxPerStageDescriptorUpdateAfterBindInlineUniformBlocks;
-       deUint32                maxDescriptorSetInlineUniformBlocks;
-       deUint32                maxDescriptorSetUpdateAfterBindInlineUniformBlocks;
+       uint32_t                maxInlineUniformBlockSize;
+       uint32_t                maxPerStageDescriptorInlineUniformBlocks;
+       uint32_t                maxPerStageDescriptorUpdateAfterBindInlineUniformBlocks;
+       uint32_t                maxDescriptorSetInlineUniformBlocks;
+       uint32_t                maxDescriptorSetUpdateAfterBindInlineUniformBlocks;
 };
 
 struct VkWriteDescriptorSetInlineUniformBlockEXT
 {
        VkStructureType sType;
        const void*             pNext;
-       deUint32                dataSize;
+       uint32_t                dataSize;
        const void*             pData;
 };
 
@@ -3693,7 +3693,7 @@ struct VkDescriptorPoolInlineUniformBlockCreateInfoEXT
 {
        VkStructureType sType;
        const void*             pNext;
-       deUint32                maxInlineUniformBlockBindings;
+       uint32_t                maxInlineUniformBlockBindings;
 };
 
 struct VkSampleLocationEXT
@@ -3708,19 +3708,19 @@ struct VkSampleLocationsInfoEXT
        const void*                                     pNext;
        VkSampleCountFlagBits           sampleLocationsPerPixel;
        VkExtent2D                                      sampleLocationGridSize;
-       deUint32                                        sampleLocationsCount;
+       uint32_t                                        sampleLocationsCount;
        const VkSampleLocationEXT*      pSampleLocations;
 };
 
 struct VkAttachmentSampleLocationsEXT
 {
-       deUint32                                        attachmentIndex;
+       uint32_t                                        attachmentIndex;
        VkSampleLocationsInfoEXT        sampleLocationsInfo;
 };
 
 struct VkSubpassSampleLocationsEXT
 {
-       deUint32                                        subpassIndex;
+       uint32_t                                        subpassIndex;
        VkSampleLocationsInfoEXT        sampleLocationsInfo;
 };
 
@@ -3728,9 +3728,9 @@ struct VkRenderPassSampleLocationsBeginInfoEXT
 {
        VkStructureType                                                 sType;
        const void*                                                             pNext;
-       deUint32                                                                attachmentInitialSampleLocationsCount;
+       uint32_t                                                                attachmentInitialSampleLocationsCount;
        const VkAttachmentSampleLocationsEXT*   pAttachmentInitialSampleLocations;
-       deUint32                                                                postSubpassSampleLocationsCount;
+       uint32_t                                                                postSubpassSampleLocationsCount;
        const VkSubpassSampleLocationsEXT*              pPostSubpassSampleLocations;
 };
 
@@ -3749,7 +3749,7 @@ struct VkPhysicalDeviceSampleLocationsPropertiesEXT
        VkSampleCountFlags      sampleLocationSampleCounts;
        VkExtent2D                      maxSampleLocationGridSize;
        float                           sampleLocationCoordinateRange[2];
-       deUint32                        sampleLocationSubPixelBits;
+       uint32_t                        sampleLocationSubPixelBits;
        VkBool32                        variableSampleLocations;
 };
 
@@ -3771,7 +3771,7 @@ struct VkPhysicalDeviceBlendOperationAdvancedPropertiesEXT
 {
        VkStructureType sType;
        void*                   pNext;
-       deUint32                advancedBlendMaxColorAttachments;
+       uint32_t                advancedBlendMaxColorAttachments;
        VkBool32                advancedBlendIndependentBlend;
        VkBool32                advancedBlendNonPremultipliedSrcColor;
        VkBool32                advancedBlendNonPremultipliedDstColor;
@@ -3794,7 +3794,7 @@ struct VkPipelineCoverageToColorStateCreateInfoNV
        const void*                                                                     pNext;
        VkPipelineCoverageToColorStateCreateFlagsNV     flags;
        VkBool32                                                                        coverageToColorEnable;
-       deUint32                                                                        coverageToColorLocation;
+       uint32_t                                                                        coverageToColorLocation;
 };
 
 struct VkPipelineCoverageModulationStateCreateInfoNV
@@ -3804,7 +3804,7 @@ struct VkPipelineCoverageModulationStateCreateInfoNV
        VkPipelineCoverageModulationStateCreateFlagsNV  flags;
        VkCoverageModulationModeNV                                              coverageModulationMode;
        VkBool32                                                                                coverageModulationTableEnable;
-       deUint32                                                                                coverageModulationTableCount;
+       uint32_t                                                                                coverageModulationTableCount;
        const float*                                                                    pCoverageModulationTable;
 };
 
@@ -3812,8 +3812,8 @@ struct VkPhysicalDeviceShaderSMBuiltinsPropertiesNV
 {
        VkStructureType sType;
        void*                   pNext;
-       deUint32                shaderSMCount;
-       deUint32                shaderWarpsPerSM;
+       uint32_t                shaderSMCount;
+       uint32_t                shaderWarpsPerSM;
 };
 
 struct VkPhysicalDeviceShaderSMBuiltinsFeaturesNV
@@ -3826,7 +3826,7 @@ struct VkPhysicalDeviceShaderSMBuiltinsFeaturesNV
 struct VkDrmFormatModifierPropertiesEXT
 {
        deUint64                                drmFormatModifier;
-       deUint32                                drmFormatModifierPlaneCount;
+       uint32_t                                drmFormatModifierPlaneCount;
        VkFormatFeatureFlags    drmFormatModifierTilingFeatures;
 };
 
@@ -3834,7 +3834,7 @@ struct VkDrmFormatModifierPropertiesListEXT
 {
        VkStructureType                                         sType;
        void*                                                           pNext;
-       deUint32                                                        drmFormatModifierCount;
+       uint32_t                                                        drmFormatModifierCount;
        VkDrmFormatModifierPropertiesEXT*       pDrmFormatModifierProperties;
 };
 
@@ -3844,15 +3844,15 @@ struct VkPhysicalDeviceImageDrmFormatModifierInfoEXT
        const void*             pNext;
        deUint64                drmFormatModifier;
        VkSharingMode   sharingMode;
-       deUint32                queueFamilyIndexCount;
-       const deUint32* pQueueFamilyIndices;
+       uint32_t                queueFamilyIndexCount;
+       const uint32_t* pQueueFamilyIndices;
 };
 
 struct VkImageDrmFormatModifierListCreateInfoEXT
 {
        VkStructureType sType;
        const void*             pNext;
-       deUint32                drmFormatModifierCount;
+       uint32_t                drmFormatModifierCount;
        const deUint64* pDrmFormatModifiers;
 };
 
@@ -3861,7 +3861,7 @@ struct VkImageDrmFormatModifierExplicitCreateInfoEXT
        VkStructureType                         sType;
        const void*                                     pNext;
        deUint64                                        drmFormatModifier;
-       deUint32                                        drmFormatModifierPlaneCount;
+       uint32_t                                        drmFormatModifierPlaneCount;
        const VkSubresourceLayout*      pPlaneLayouts;
 };
 
@@ -3890,7 +3890,7 @@ struct VkShaderModuleValidationCacheCreateInfoEXT
 
 struct VkShadingRatePaletteNV
 {
-       deUint32                                                        shadingRatePaletteEntryCount;
+       uint32_t                                                        shadingRatePaletteEntryCount;
        const VkShadingRatePaletteEntryNV*      pShadingRatePaletteEntries;
 };
 
@@ -3899,7 +3899,7 @@ struct VkPipelineViewportShadingRateImageStateCreateInfoNV
        VkStructureType                                 sType;
        const void*                                             pNext;
        VkBool32                                                shadingRateImageEnable;
-       deUint32                                                viewportCount;
+       uint32_t                                                viewportCount;
        const VkShadingRatePaletteNV*   pShadingRatePalettes;
 };
 
@@ -3916,22 +3916,22 @@ struct VkPhysicalDeviceShadingRateImagePropertiesNV
        VkStructureType sType;
        void*                   pNext;
        VkExtent2D              shadingRateTexelSize;
-       deUint32                shadingRatePaletteSize;
-       deUint32                shadingRateMaxCoarseSamples;
+       uint32_t                shadingRatePaletteSize;
+       uint32_t                shadingRateMaxCoarseSamples;
 };
 
 struct VkCoarseSampleLocationNV
 {
-       deUint32        pixelX;
-       deUint32        pixelY;
-       deUint32        sample;
+       uint32_t        pixelX;
+       uint32_t        pixelY;
+       uint32_t        sample;
 };
 
 struct VkCoarseSampleOrderCustomNV
 {
        VkShadingRatePaletteEntryNV             shadingRate;
-       deUint32                                                sampleCount;
-       deUint32                                                sampleLocationCount;
+       uint32_t                                                sampleCount;
+       uint32_t                                                sampleLocationCount;
        const VkCoarseSampleLocationNV* pSampleLocations;
 };
 
@@ -3940,7 +3940,7 @@ struct VkPipelineViewportCoarseSampleOrderStateCreateInfoNV
        VkStructureType                                         sType;
        const void*                                                     pNext;
        VkCoarseSampleOrderTypeNV                       sampleOrderType;
-       deUint32                                                        customSampleOrderCount;
+       uint32_t                                                        customSampleOrderCount;
        const VkCoarseSampleOrderCustomNV*      pCustomSampleOrders;
 };
 
@@ -3949,10 +3949,10 @@ struct VkRayTracingShaderGroupCreateInfoNV
        VkStructureType                                 sType;
        const void*                                             pNext;
        VkRayTracingShaderGroupTypeKHR  type;
-       deUint32                                                generalShader;
-       deUint32                                                closestHitShader;
-       deUint32                                                anyHitShader;
-       deUint32                                                intersectionShader;
+       uint32_t                                                generalShader;
+       uint32_t                                                closestHitShader;
+       uint32_t                                                anyHitShader;
+       uint32_t                                                intersectionShader;
 };
 
 struct VkRayTracingPipelineCreateInfoNV
@@ -3960,14 +3960,14 @@ struct VkRayTracingPipelineCreateInfoNV
        VkStructureType                                                         sType;
        const void*                                                                     pNext;
        VkPipelineCreateFlags                                           flags;
-       deUint32                                                                        stageCount;
+       uint32_t                                                                        stageCount;
        const VkPipelineShaderStageCreateInfo*          pStages;
-       deUint32                                                                        groupCount;
+       uint32_t                                                                        groupCount;
        const VkRayTracingShaderGroupCreateInfoNV*      pGroups;
-       deUint32                                                                        maxRecursionDepth;
+       uint32_t                                                                        maxRecursionDepth;
        VkPipelineLayout                                                        layout;
        VkPipeline                                                                      basePipelineHandle;
-       deInt32                                                                         basePipelineIndex;
+       int32_t                                                                         basePipelineIndex;
 };
 
 struct VkGeometryTrianglesNV
@@ -3976,12 +3976,12 @@ struct VkGeometryTrianglesNV
        const void*             pNext;
        VkBuffer                vertexData;
        VkDeviceSize    vertexOffset;
-       deUint32                vertexCount;
+       uint32_t                vertexCount;
        VkDeviceSize    vertexStride;
        VkFormat                vertexFormat;
        VkBuffer                indexData;
        VkDeviceSize    indexOffset;
-       deUint32                indexCount;
+       uint32_t                indexCount;
        VkIndexType             indexType;
        VkBuffer                transformData;
        VkDeviceSize    transformOffset;
@@ -3992,8 +3992,8 @@ struct VkGeometryAABBNV
        VkStructureType sType;
        const void*             pNext;
        VkBuffer                aabbData;
-       deUint32                numAABBs;
-       deUint32                stride;
+       uint32_t                numAABBs;
+       uint32_t                stride;
        VkDeviceSize    offset;
 };
 
@@ -4018,8 +4018,8 @@ struct VkAccelerationStructureInfoNV
        const void*                                                     pNext;
        VkAccelerationStructureTypeNV           type;
        VkBuildAccelerationStructureFlagsNV     flags;
-       deUint32                                                        instanceCount;
-       deUint32                                                        geometryCount;
+       uint32_t                                                        instanceCount;
+       uint32_t                                                        geometryCount;
        const VkGeometryNV*                                     pGeometries;
 };
 
@@ -4038,15 +4038,15 @@ struct VkBindAccelerationStructureMemoryInfoNV
        VkAccelerationStructureNV       accelerationStructure;
        VkDeviceMemory                          memory;
        VkDeviceSize                            memoryOffset;
-       deUint32                                        deviceIndexCount;
-       const deUint32*                         pDeviceIndices;
+       uint32_t                                        deviceIndexCount;
+       const uint32_t*                         pDeviceIndices;
 };
 
 struct VkWriteDescriptorSetAccelerationStructureNV
 {
        VkStructureType                                         sType;
        const void*                                                     pNext;
-       deUint32                                                        accelerationStructureCount;
+       uint32_t                                                        accelerationStructureCount;
        const VkAccelerationStructureNV*        pAccelerationStructures;
 };
 
@@ -4062,14 +4062,14 @@ struct VkPhysicalDeviceRayTracingPropertiesNV
 {
        VkStructureType sType;
        void*                   pNext;
-       deUint32                shaderGroupHandleSize;
-       deUint32                maxRecursionDepth;
-       deUint32                maxShaderGroupStride;
-       deUint32                shaderGroupBaseAlignment;
+       uint32_t                shaderGroupHandleSize;
+       uint32_t                maxRecursionDepth;
+       uint32_t                maxShaderGroupStride;
+       uint32_t                shaderGroupBaseAlignment;
        deUint64                maxGeometryCount;
        deUint64                maxInstanceCount;
        deUint64                maxTriangleCount;
-       deUint32                maxDescriptorSetAccelerationStructures;
+       uint32_t                maxDescriptorSetAccelerationStructures;
 };
 
 struct VkTransformMatrixKHR
@@ -4090,9 +4090,9 @@ struct VkAabbPositionsKHR
 struct VkAccelerationStructureInstanceKHR
 {
        VkTransformMatrixKHR            transform;
-       deUint32                                        instanceCustomIndex:24;
-       deUint32                                        mask:8;
-       deUint32                                        instanceShaderBindingTableRecordOffset:24;
+       uint32_t                                        instanceCustomIndex:24;
+       uint32_t                                        mask:8;
+       uint32_t                                        instanceShaderBindingTableRecordOffset:24;
        VkGeometryInstanceFlagsKHR      flags:8;
        deUint64                                        accelerationStructureReference;
 };
@@ -4145,7 +4145,7 @@ struct VkMemoryHostPointerPropertiesEXT
 {
        VkStructureType sType;
        void*                   pNext;
-       deUint32                memoryTypeBits;
+       uint32_t                memoryTypeBits;
 };
 
 struct VkPhysicalDeviceExternalMemoryHostPropertiesEXT
@@ -4173,20 +4173,20 @@ struct VkPhysicalDeviceShaderCorePropertiesAMD
 {
        VkStructureType sType;
        void*                   pNext;
-       deUint32                shaderEngineCount;
-       deUint32                shaderArraysPerEngineCount;
-       deUint32                computeUnitsPerShaderArray;
-       deUint32                simdPerComputeUnit;
-       deUint32                wavefrontsPerSimd;
-       deUint32                wavefrontSize;
-       deUint32                sgprsPerSimd;
-       deUint32                minSgprAllocation;
-       deUint32                maxSgprAllocation;
-       deUint32                sgprAllocationGranularity;
-       deUint32                vgprsPerSimd;
-       deUint32                minVgprAllocation;
-       deUint32                maxVgprAllocation;
-       deUint32                vgprAllocationGranularity;
+       uint32_t                shaderEngineCount;
+       uint32_t                shaderArraysPerEngineCount;
+       uint32_t                computeUnitsPerShaderArray;
+       uint32_t                simdPerComputeUnit;
+       uint32_t                wavefrontsPerSimd;
+       uint32_t                wavefrontSize;
+       uint32_t                sgprsPerSimd;
+       uint32_t                minSgprAllocation;
+       uint32_t                maxSgprAllocation;
+       uint32_t                sgprAllocationGranularity;
+       uint32_t                vgprsPerSimd;
+       uint32_t                minVgprAllocation;
+       uint32_t                maxVgprAllocation;
+       uint32_t                vgprAllocationGranularity;
 };
 
 struct VkDeviceMemoryOverallocationCreateInfoAMD
@@ -4200,20 +4200,20 @@ struct VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT
 {
        VkStructureType sType;
        void*                   pNext;
-       deUint32                maxVertexAttribDivisor;
+       uint32_t                maxVertexAttribDivisor;
 };
 
 struct VkVertexInputBindingDivisorDescriptionEXT
 {
-       deUint32        binding;
-       deUint32        divisor;
+       uint32_t        binding;
+       uint32_t        divisor;
 };
 
 struct VkPipelineVertexInputDivisorStateCreateInfoEXT
 {
        VkStructureType                                                                         sType;
        const void*                                                                                     pNext;
-       deUint32                                                                                        vertexBindingDivisorCount;
+       uint32_t                                                                                        vertexBindingDivisorCount;
        const VkVertexInputBindingDivisorDescriptionEXT*        pVertexBindingDivisors;
 };
 
@@ -4236,7 +4236,7 @@ struct VkPipelineCreationFeedbackCreateInfoEXT
        VkStructureType                                 sType;
        const void*                                             pNext;
        VkPipelineCreationFeedbackEXT*  pPipelineCreationFeedback;
-       deUint32                                                pipelineStageCreationFeedbackCount;
+       uint32_t                                                pipelineStageCreationFeedbackCount;
        VkPipelineCreationFeedbackEXT*  pPipelineStageCreationFeedbacks;
 };
 
@@ -4260,25 +4260,25 @@ struct VkPhysicalDeviceMeshShaderPropertiesNV
 {
        VkStructureType sType;
        void*                   pNext;
-       deUint32                maxDrawMeshTasksCount;
-       deUint32                maxTaskWorkGroupInvocations;
-       deUint32                maxTaskWorkGroupSize[3];
-       deUint32                maxTaskTotalMemorySize;
-       deUint32                maxTaskOutputCount;
-       deUint32                maxMeshWorkGroupInvocations;
-       deUint32                maxMeshWorkGroupSize[3];
-       deUint32                maxMeshTotalMemorySize;
-       deUint32                maxMeshOutputVertices;
-       deUint32                maxMeshOutputPrimitives;
-       deUint32                maxMeshMultiviewViewCount;
-       deUint32                meshOutputPerVertexGranularity;
-       deUint32                meshOutputPerPrimitiveGranularity;
+       uint32_t                maxDrawMeshTasksCount;
+       uint32_t                maxTaskWorkGroupInvocations;
+       uint32_t                maxTaskWorkGroupSize[3];
+       uint32_t                maxTaskTotalMemorySize;
+       uint32_t                maxTaskOutputCount;
+       uint32_t                maxMeshWorkGroupInvocations;
+       uint32_t                maxMeshWorkGroupSize[3];
+       uint32_t                maxMeshTotalMemorySize;
+       uint32_t                maxMeshOutputVertices;
+       uint32_t                maxMeshOutputPrimitives;
+       uint32_t                maxMeshMultiviewViewCount;
+       uint32_t                meshOutputPerVertexGranularity;
+       uint32_t                meshOutputPerPrimitiveGranularity;
 };
 
 struct VkDrawMeshTasksIndirectCommandNV
 {
-       deUint32        taskCount;
-       deUint32        firstTask;
+       uint32_t        taskCount;
+       uint32_t        firstTask;
 };
 
 struct VkPhysicalDeviceFragmentShaderBarycentricFeaturesNV
@@ -4299,7 +4299,7 @@ struct VkPipelineViewportExclusiveScissorStateCreateInfoNV
 {
        VkStructureType sType;
        const void*             pNext;
-       deUint32                exclusiveScissorCount;
+       uint32_t                exclusiveScissorCount;
        const VkRect2D* pExclusiveScissors;
 };
 
@@ -4334,7 +4334,7 @@ struct VkPhysicalDeviceShaderIntegerFunctions2FeaturesINTEL
 
 union VkPerformanceValueDataINTEL
 {
-       deUint32        value32;
+       uint32_t        value32;
        deUint64        value64;
        float           valueFloat;
        VkBool32        valueBool;
@@ -4372,7 +4372,7 @@ struct VkPerformanceStreamMarkerInfoINTEL
 {
        VkStructureType sType;
        const void*             pNext;
-       deUint32                marker;
+       uint32_t                marker;
 };
 
 struct VkPerformanceOverrideInfoINTEL
@@ -4395,10 +4395,10 @@ struct VkPhysicalDevicePCIBusInfoPropertiesEXT
 {
        VkStructureType sType;
        void*                   pNext;
-       deUint32                pciDomain;
-       deUint32                pciBus;
-       deUint32                pciDevice;
-       deUint32                pciFunction;
+       uint32_t                pciDomain;
+       uint32_t                pciBus;
+       uint32_t                pciDevice;
+       uint32_t                pciFunction;
 };
 
 struct VkDisplayNativeHdrSurfaceCapabilitiesAMD
@@ -4452,9 +4452,9 @@ struct VkPhysicalDeviceSubgroupSizeControlPropertiesEXT
 {
        VkStructureType         sType;
        void*                           pNext;
-       deUint32                        minSubgroupSize;
-       deUint32                        maxSubgroupSize;
-       deUint32                        maxComputeWorkgroupSubgroups;
+       uint32_t                        minSubgroupSize;
+       uint32_t                        maxSubgroupSize;
+       uint32_t                        maxComputeWorkgroupSubgroups;
        VkShaderStageFlags      requiredSubgroupSizeStages;
 };
 
@@ -4462,7 +4462,7 @@ struct VkPipelineShaderStageRequiredSubgroupSizeCreateInfoEXT
 {
        VkStructureType sType;
        void*                   pNext;
-       deUint32                requiredSubgroupSize;
+       uint32_t                requiredSubgroupSize;
 };
 
 struct VkPhysicalDeviceShaderCoreProperties2AMD
@@ -4470,7 +4470,7 @@ struct VkPhysicalDeviceShaderCoreProperties2AMD
        VkStructureType                                 sType;
        void*                                                   pNext;
        VkShaderCorePropertiesFlagsAMD  shaderCoreFeatures;
-       deUint32                                                activeComputeUnitCount;
+       uint32_t                                                activeComputeUnitCount;
 };
 
 struct VkPhysicalDeviceCoherentMemoryFeaturesAMD
@@ -4548,9 +4548,9 @@ struct VkValidationFeaturesEXT
 {
        VkStructureType                                                 sType;
        const void*                                                             pNext;
-       deUint32                                                                enabledValidationFeatureCount;
+       uint32_t                                                                enabledValidationFeatureCount;
        const VkValidationFeatureEnableEXT*             pEnabledValidationFeatures;
-       deUint32                                                                disabledValidationFeatureCount;
+       uint32_t                                                                disabledValidationFeatureCount;
        const VkValidationFeatureDisableEXT*    pDisabledValidationFeatures;
 };
 
@@ -4558,9 +4558,9 @@ struct VkCooperativeMatrixPropertiesNV
 {
        VkStructureType         sType;
        void*                           pNext;
-       deUint32                        MSize;
-       deUint32                        NSize;
-       deUint32                        KSize;
+       uint32_t                        MSize;
+       uint32_t                        NSize;
+       uint32_t                        KSize;
        VkComponentTypeNV       AType;
        VkComponentTypeNV       BType;
        VkComponentTypeNV       CType;
@@ -4670,7 +4670,7 @@ struct VkPhysicalDeviceLineRasterizationPropertiesEXT
 {
        VkStructureType sType;
        void*                   pNext;
-       deUint32                lineSubPixelPrecisionBits;
+       uint32_t                lineSubPixelPrecisionBits;
 };
 
 struct VkPipelineRasterizationLineStateCreateInfoEXT
@@ -4679,7 +4679,7 @@ struct VkPipelineRasterizationLineStateCreateInfoEXT
        const void*                                     pNext;
        VkLineRasterizationModeEXT      lineRasterizationMode;
        VkBool32                                        stippledLineEnable;
-       deUint32                                        lineStippleFactor;
+       uint32_t                                        lineStippleFactor;
        deUint16                                        lineStipplePattern;
 };
 
@@ -4726,15 +4726,15 @@ struct VkPhysicalDeviceDeviceGeneratedCommandsPropertiesNV
 {
        VkStructureType sType;
        void*                   pNext;
-       deUint32                maxGraphicsShaderGroupCount;
-       deUint32                maxIndirectSequenceCount;
-       deUint32                maxIndirectCommandsTokenCount;
-       deUint32                maxIndirectCommandsStreamCount;
-       deUint32                maxIndirectCommandsTokenOffset;
-       deUint32                maxIndirectCommandsStreamStride;
-       deUint32                minSequencesCountBufferOffsetAlignment;
-       deUint32                minSequencesIndexBufferOffsetAlignment;
-       deUint32                minIndirectCommandsBufferOffsetAlignment;
+       uint32_t                maxGraphicsShaderGroupCount;
+       uint32_t                maxIndirectSequenceCount;
+       uint32_t                maxIndirectCommandsTokenCount;
+       uint32_t                maxIndirectCommandsStreamCount;
+       uint32_t                maxIndirectCommandsTokenOffset;
+       uint32_t                maxIndirectCommandsStreamStride;
+       uint32_t                minSequencesCountBufferOffsetAlignment;
+       uint32_t                minSequencesIndexBufferOffsetAlignment;
+       uint32_t                minIndirectCommandsBufferOffsetAlignment;
 };
 
 struct VkPhysicalDeviceDeviceGeneratedCommandsFeaturesNV
@@ -4748,7 +4748,7 @@ struct VkGraphicsShaderGroupCreateInfoNV
 {
        VkStructureType                                                                 sType;
        const void*                                                                             pNext;
-       deUint32                                                                                stageCount;
+       uint32_t                                                                                stageCount;
        const VkPipelineShaderStageCreateInfo*                  pStages;
        const VkPipelineVertexInputStateCreateInfo*             pVertexInputState;
        const VkPipelineTessellationStateCreateInfo*    pTessellationState;
@@ -4758,34 +4758,34 @@ struct VkGraphicsPipelineShaderGroupsCreateInfoNV
 {
        VkStructureType                                                         sType;
        const void*                                                                     pNext;
-       deUint32                                                                        groupCount;
+       uint32_t                                                                        groupCount;
        const VkGraphicsShaderGroupCreateInfoNV*        pGroups;
-       deUint32                                                                        pipelineCount;
+       uint32_t                                                                        pipelineCount;
        const VkPipeline*                                                       pPipelines;
 };
 
 struct VkBindShaderGroupIndirectCommandNV
 {
-       deUint32        groupIndex;
+       uint32_t        groupIndex;
 };
 
 struct VkBindIndexBufferIndirectCommandNV
 {
        VkDeviceAddress bufferAddress;
-       deUint32                size;
+       uint32_t                size;
        VkIndexType             indexType;
 };
 
 struct VkBindVertexBufferIndirectCommandNV
 {
        VkDeviceAddress bufferAddress;
-       deUint32                size;
-       deUint32                stride;
+       uint32_t                size;
+       uint32_t                stride;
 };
 
 struct VkSetStateFlagsIndirectCommandNV
 {
-       deUint32        data;
+       uint32_t        data;
 };
 
 struct VkIndirectCommandsStreamNV
@@ -4799,18 +4799,18 @@ struct VkIndirectCommandsLayoutTokenNV
        VkStructureType                                 sType;
        const void*                                             pNext;
        VkIndirectCommandsTokenTypeNV   tokenType;
-       deUint32                                                stream;
-       deUint32                                                offset;
-       deUint32                                                vertexBindingUnit;
+       uint32_t                                                stream;
+       uint32_t                                                offset;
+       uint32_t                                                vertexBindingUnit;
        VkBool32                                                vertexDynamicStride;
        VkPipelineLayout                                pushconstantPipelineLayout;
        VkShaderStageFlags                              pushconstantShaderStageFlags;
-       deUint32                                                pushconstantOffset;
-       deUint32                                                pushconstantSize;
+       uint32_t                                                pushconstantOffset;
+       uint32_t                                                pushconstantSize;
        VkIndirectStateFlagsNV                  indirectStateFlags;
-       deUint32                                                indexTypeCount;
+       uint32_t                                                indexTypeCount;
        const VkIndexType*                              pIndexTypes;
-       const deUint32*                                 pIndexTypeValues;
+       const uint32_t*                                 pIndexTypeValues;
 };
 
 struct VkIndirectCommandsLayoutCreateInfoNV
@@ -4819,10 +4819,10 @@ struct VkIndirectCommandsLayoutCreateInfoNV
        const void*                                                             pNext;
        VkIndirectCommandsLayoutUsageFlagsNV    flags;
        VkPipelineBindPoint                                             pipelineBindPoint;
-       deUint32                                                                tokenCount;
+       uint32_t                                                                tokenCount;
        const VkIndirectCommandsLayoutTokenNV*  pTokens;
-       deUint32                                                                streamCount;
-       const deUint32*                                                 pStreamStrides;
+       uint32_t                                                                streamCount;
+       const uint32_t*                                                 pStreamStrides;
 };
 
 struct VkGeneratedCommandsInfoNV
@@ -4832,9 +4832,9 @@ struct VkGeneratedCommandsInfoNV
        VkPipelineBindPoint                                     pipelineBindPoint;
        VkPipeline                                                      pipeline;
        VkIndirectCommandsLayoutNV                      indirectCommandsLayout;
-       deUint32                                                        streamCount;
+       uint32_t                                                        streamCount;
        const VkIndirectCommandsStreamNV*       pStreams;
-       deUint32                                                        sequencesCount;
+       uint32_t                                                        sequencesCount;
        VkBuffer                                                        preprocessBuffer;
        VkDeviceSize                                            preprocessOffset;
        VkDeviceSize                                            preprocessSize;
@@ -4851,7 +4851,7 @@ struct VkGeneratedCommandsMemoryRequirementsInfoNV
        VkPipelineBindPoint                     pipelineBindPoint;
        VkPipeline                                      pipeline;
        VkIndirectCommandsLayoutNV      indirectCommandsLayout;
-       deUint32                                        maxSequencesCount;
+       uint32_t                                        maxSequencesCount;
 };
 
 struct VkPhysicalDeviceInheritedViewportScissorFeaturesNV
@@ -4866,7 +4866,7 @@ struct VkCommandBufferInheritanceViewportScissorInfoNV
        VkStructureType         sType;
        const void*                     pNext;
        VkBool32                        viewportScissor2D;
-       deUint32                        viewportDepthCount;
+       uint32_t                        viewportDepthCount;
        const VkViewport*       pViewportDepths;
 };
 
@@ -4919,7 +4919,7 @@ struct VkDeviceMemoryReportCallbackDataEXT
        VkDeviceSize                                            size;
        VkObjectType                                            objectType;
        deUint64                                                        objectHandle;
-       deUint32                                                        heapIndex;
+       uint32_t                                                        heapIndex;
 };
 
 struct VkDeviceDeviceMemoryReportCreateInfoEXT
@@ -4960,7 +4960,7 @@ struct VkPhysicalDeviceCustomBorderColorPropertiesEXT
 {
        VkStructureType sType;
        void*                   pNext;
-       deUint32                maxCustomBorderColorSamplers;
+       uint32_t                maxCustomBorderColorSamplers;
 };
 
 struct VkPhysicalDeviceCustomBorderColorFeaturesEXT
@@ -4982,7 +4982,7 @@ struct VkDevicePrivateDataCreateInfoEXT
 {
        VkStructureType sType;
        const void*             pNext;
-       deUint32                privateDataSlotRequestCount;
+       uint32_t                privateDataSlotRequestCount;
 };
 
 struct VkPrivateDataSlotCreateInfoEXT
@@ -5055,7 +5055,7 @@ struct VkAccelerationStructureMotionInfoNV
 {
        VkStructureType                                                         sType;
        const void*                                                                     pNext;
-       deUint32                                                                        maxInstances;
+       uint32_t                                                                        maxInstances;
        VkAccelerationStructureMotionInfoFlagsNV        flags;
 };
 
@@ -5063,9 +5063,9 @@ struct VkAccelerationStructureMatrixMotionInstanceNV
 {
        VkTransformMatrixKHR            transformT0;
        VkTransformMatrixKHR            transformT1;
-       deUint32                                        instanceCustomIndex:24;
-       deUint32                                        mask:8;
-       deUint32                                        instanceShaderBindingTableRecordOffset:24;
+       uint32_t                                        instanceCustomIndex:24;
+       uint32_t                                        mask:8;
+       uint32_t                                        instanceShaderBindingTableRecordOffset:24;
        VkGeometryInstanceFlagsKHR      flags:8;
        deUint64                                        accelerationStructureReference;
 };
@@ -5094,9 +5094,9 @@ struct VkAccelerationStructureSRTMotionInstanceNV
 {
        VkSRTDataNV                                     transformT0;
        VkSRTDataNV                                     transformT1;
-       deUint32                                        instanceCustomIndex:24;
-       deUint32                                        mask:8;
-       deUint32                                        instanceShaderBindingTableRecordOffset:24;
+       uint32_t                                        instanceCustomIndex:24;
+       uint32_t                                        mask:8;
+       uint32_t                                        instanceShaderBindingTableRecordOffset:24;
        VkGeometryInstanceFlagsKHR      flags:8;
        deUint64                                        accelerationStructureReference;
 };
@@ -5143,8 +5143,8 @@ struct VkPhysicalDeviceFragmentDensityMap2PropertiesEXT
        void*                   pNext;
        VkBool32                subsampledLoads;
        VkBool32                subsampledCoarseReconstructionEarlyAccess;
-       deUint32                maxSubsampledArrayLayers;
-       deUint32                maxDescriptorSetSubsampledSamplers;
+       uint32_t                maxSubsampledArrayLayers;
+       uint32_t                maxDescriptorSetSubsampledSamplers;
 };
 
 struct VkCopyCommandTransformInfoQCOM
@@ -5178,7 +5178,7 @@ struct VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE
 
 struct VkMutableDescriptorTypeListVALVE
 {
-       deUint32                                descriptorTypeCount;
+       uint32_t                                descriptorTypeCount;
        const VkDescriptorType* pDescriptorTypes;
 };
 
@@ -5186,7 +5186,7 @@ struct VkMutableDescriptorTypeCreateInfoVALVE
 {
        VkStructureType                                                 sType;
        const void*                                                             pNext;
-       deUint32                                                                mutableDescriptorTypeListCount;
+       uint32_t                                                                mutableDescriptorTypeListCount;
        const VkMutableDescriptorTypeListVALVE* pMutableDescriptorTypeLists;
 };
 
@@ -5201,20 +5201,20 @@ struct VkVertexInputBindingDescription2EXT
 {
        VkStructureType         sType;
        void*                           pNext;
-       deUint32                        binding;
-       deUint32                        stride;
+       uint32_t                        binding;
+       uint32_t                        stride;
        VkVertexInputRate       inputRate;
-       deUint32                        divisor;
+       uint32_t                        divisor;
 };
 
 struct VkVertexInputAttributeDescription2EXT
 {
        VkStructureType sType;
        void*                   pNext;
-       deUint32                location;
-       deUint32                binding;
+       uint32_t                location;
+       uint32_t                binding;
        VkFormat                format;
-       deUint32                offset;
+       uint32_t                offset;
 };
 
 struct VkPhysicalDeviceDrmPropertiesEXT
@@ -5234,7 +5234,7 @@ struct VkSubpassShadingPipelineCreateInfoHUAWEI
        VkStructureType sType;
        void*                   pNext;
        VkRenderPass    renderPass;
-       deUint32                subpass;
+       uint32_t                subpass;
 };
 
 struct VkPhysicalDeviceSubpassShadingFeaturesHUAWEI
@@ -5248,7 +5248,7 @@ struct VkPhysicalDeviceSubpassShadingPropertiesHUAWEI
 {
        VkStructureType sType;
        void*                   pNext;
-       deUint32                maxSubpassShadingWorkgroupSizeAspectRatio;
+       uint32_t                maxSubpassShadingWorkgroupSizeAspectRatio;
 };
 
 struct VkMemoryGetRemoteAddressInfoNV
@@ -5286,7 +5286,7 @@ struct VkPipelineColorWriteCreateInfoEXT
 {
        VkStructureType sType;
        const void*             pNext;
-       deUint32                attachmentCount;
+       uint32_t                attachmentCount;
        const VkBool32* pColorWriteEnables;
 };
 
@@ -5301,7 +5301,7 @@ struct VkQueueFamilyGlobalPriorityPropertiesEXT
 {
        VkStructureType                         sType;
        void*                                           pNext;
-       deUint32                                        priorityCount;
+       uint32_t                                        priorityCount;
        VkQueueGlobalPriorityEXT        priorities[VK_MAX_GLOBAL_PRIORITY_SIZE_EXT];
 };
 
@@ -5316,20 +5316,20 @@ struct VkPhysicalDeviceMultiDrawPropertiesEXT
 {
        VkStructureType sType;
        void*                   pNext;
-       deUint32                maxMultiDrawCount;
+       uint32_t                maxMultiDrawCount;
 };
 
 struct VkMultiDrawInfoEXT
 {
-       deUint32        firstVertex;
-       deUint32        vertexCount;
+       uint32_t        firstVertex;
+       uint32_t        vertexCount;
 };
 
 struct VkMultiDrawIndexedInfoEXT
 {
-       deUint32        firstIndex;
-       deUint32        indexCount;
-       deInt32         vertexOffset;
+       uint32_t        firstIndex;
+       uint32_t        indexCount;
+       int32_t         vertexOffset;
 };
 
 union VkDeviceOrHostAddressKHR
@@ -5340,10 +5340,10 @@ union VkDeviceOrHostAddressKHR
 
 struct VkAccelerationStructureBuildRangeInfoKHR
 {
-       deUint32        primitiveCount;
-       deUint32        primitiveOffset;
-       deUint32        firstVertex;
-       deUint32        transformOffset;
+       uint32_t        primitiveCount;
+       uint32_t        primitiveOffset;
+       uint32_t        firstVertex;
+       uint32_t        transformOffset;
 };
 
 struct VkAccelerationStructureGeometryTrianglesDataKHR
@@ -5353,7 +5353,7 @@ struct VkAccelerationStructureGeometryTrianglesDataKHR
        VkFormat                                                vertexFormat;
        VkDeviceOrHostAddressConstKHR   vertexData;
        VkDeviceSize                                    vertexStride;
-       deUint32                                                maxVertex;
+       uint32_t                                                maxVertex;
        VkIndexType                                             indexType;
        VkDeviceOrHostAddressConstKHR   indexData;
        VkDeviceOrHostAddressConstKHR   transformData;
@@ -5400,7 +5400,7 @@ struct VkAccelerationStructureBuildGeometryInfoKHR
        VkBuildAccelerationStructureModeKHR                                     mode;
        VkAccelerationStructureKHR                                                      srcAccelerationStructure;
        VkAccelerationStructureKHR                                                      dstAccelerationStructure;
-       deUint32                                                                                        geometryCount;
+       uint32_t                                                                                        geometryCount;
        const VkAccelerationStructureGeometryKHR*                       pGeometries;
        const VkAccelerationStructureGeometryKHR* const*        ppGeometries;
        VkDeviceOrHostAddressKHR                                                        scratchData;
@@ -5422,7 +5422,7 @@ struct VkWriteDescriptorSetAccelerationStructureKHR
 {
        VkStructureType                                         sType;
        const void*                                                     pNext;
-       deUint32                                                        accelerationStructureCount;
+       uint32_t                                                        accelerationStructureCount;
        const VkAccelerationStructureKHR*       pAccelerationStructures;
 };
 
@@ -5444,11 +5444,11 @@ struct VkPhysicalDeviceAccelerationStructurePropertiesKHR
        deUint64                maxGeometryCount;
        deUint64                maxInstanceCount;
        deUint64                maxPrimitiveCount;
-       deUint32                maxPerStageDescriptorAccelerationStructures;
-       deUint32                maxPerStageDescriptorUpdateAfterBindAccelerationStructures;
-       deUint32                maxDescriptorSetAccelerationStructures;
-       deUint32                maxDescriptorSetUpdateAfterBindAccelerationStructures;
-       deUint32                minAccelerationStructureScratchOffsetAlignment;
+       uint32_t                maxPerStageDescriptorAccelerationStructures;
+       uint32_t                maxPerStageDescriptorUpdateAfterBindAccelerationStructures;
+       uint32_t                maxDescriptorSetAccelerationStructures;
+       uint32_t                maxDescriptorSetUpdateAfterBindAccelerationStructures;
+       uint32_t                minAccelerationStructureScratchOffsetAlignment;
 };
 
 struct VkAccelerationStructureDeviceAddressInfoKHR
@@ -5506,10 +5506,10 @@ struct VkRayTracingShaderGroupCreateInfoKHR
        VkStructureType                                 sType;
        const void*                                             pNext;
        VkRayTracingShaderGroupTypeKHR  type;
-       deUint32                                                generalShader;
-       deUint32                                                closestHitShader;
-       deUint32                                                anyHitShader;
-       deUint32                                                intersectionShader;
+       uint32_t                                                generalShader;
+       uint32_t                                                closestHitShader;
+       uint32_t                                                anyHitShader;
+       uint32_t                                                intersectionShader;
        const void*                                             pShaderGroupCaptureReplayHandle;
 };
 
@@ -5517,8 +5517,8 @@ struct VkRayTracingPipelineInterfaceCreateInfoKHR
 {
        VkStructureType sType;
        const void*             pNext;
-       deUint32                maxPipelineRayPayloadSize;
-       deUint32                maxPipelineRayHitAttributeSize;
+       uint32_t                maxPipelineRayPayloadSize;
+       uint32_t                maxPipelineRayHitAttributeSize;
 };
 
 struct VkRayTracingPipelineCreateInfoKHR
@@ -5526,17 +5526,17 @@ struct VkRayTracingPipelineCreateInfoKHR
        VkStructureType                                                                         sType;
        const void*                                                                                     pNext;
        VkPipelineCreateFlags                                                           flags;
-       deUint32                                                                                        stageCount;
+       uint32_t                                                                                        stageCount;
        const VkPipelineShaderStageCreateInfo*                          pStages;
-       deUint32                                                                                        groupCount;
+       uint32_t                                                                                        groupCount;
        const VkRayTracingShaderGroupCreateInfoKHR*                     pGroups;
-       deUint32                                                                                        maxPipelineRayRecursionDepth;
+       uint32_t                                                                                        maxPipelineRayRecursionDepth;
        const VkPipelineLibraryCreateInfoKHR*                           pLibraryInfo;
        const VkRayTracingPipelineInterfaceCreateInfoKHR*       pLibraryInterface;
        const VkPipelineDynamicStateCreateInfo*                         pDynamicState;
        VkPipelineLayout                                                                        layout;
        VkPipeline                                                                                      basePipelineHandle;
-       deInt32                                                                                         basePipelineIndex;
+       int32_t                                                                                         basePipelineIndex;
 };
 
 struct VkPhysicalDeviceRayTracingPipelineFeaturesKHR
@@ -5554,14 +5554,14 @@ struct VkPhysicalDeviceRayTracingPipelinePropertiesKHR
 {
        VkStructureType sType;
        void*                   pNext;
-       deUint32                shaderGroupHandleSize;
-       deUint32                maxRayRecursionDepth;
-       deUint32                maxShaderGroupStride;
-       deUint32                shaderGroupBaseAlignment;
-       deUint32                shaderGroupHandleCaptureReplaySize;
-       deUint32                maxRayDispatchInvocationCount;
-       deUint32                shaderGroupHandleAlignment;
-       deUint32                maxRayHitAttributeSize;
+       uint32_t                shaderGroupHandleSize;
+       uint32_t                maxRayRecursionDepth;
+       uint32_t                maxShaderGroupStride;
+       uint32_t                shaderGroupBaseAlignment;
+       uint32_t                shaderGroupHandleCaptureReplaySize;
+       uint32_t                maxRayDispatchInvocationCount;
+       uint32_t                shaderGroupHandleAlignment;
+       uint32_t                maxRayHitAttributeSize;
 };
 
 struct VkStridedDeviceAddressRegionKHR
@@ -5573,9 +5573,9 @@ struct VkStridedDeviceAddressRegionKHR
 
 struct VkTraceRaysIndirectCommandKHR
 {
-       deUint32        width;
-       deUint32        height;
-       deUint32        depth;
+       uint32_t        width;
+       uint32_t        height;
+       uint32_t        depth;
 };
 
 struct VkPhysicalDeviceRayQueryFeaturesKHR
@@ -5605,7 +5605,7 @@ struct VkAndroidHardwareBufferPropertiesANDROID
        VkStructureType sType;
        void*                   pNext;
        VkDeviceSize    allocationSize;
-       deUint32                memoryTypeBits;
+       uint32_t                memoryTypeBits;
 };
 
 struct VkAndroidHardwareBufferFormatPropertiesANDROID
@@ -5664,7 +5664,7 @@ struct VkVideoProfilesKHR
 {
        VkStructureType                         sType;
        void*                                           pNext;
-       deUint32                                        profileCount;
+       uint32_t                                        profileCount;
        const VkVideoProfileKHR*        pProfiles;
 };
 
@@ -5678,8 +5678,8 @@ struct VkVideoCapabilitiesKHR
        VkExtent2D                                      videoPictureExtentGranularity;
        VkExtent2D                                      minExtent;
        VkExtent2D                                      maxExtent;
-       deUint32                                        maxReferencePicturesSlotsCount;
-       deUint32                                        maxReferencePicturesActiveCount;
+       uint32_t                                        maxReferencePicturesSlotsCount;
+       uint32_t                                        maxReferencePicturesActiveCount;
 };
 
 struct VkPhysicalDeviceVideoFormatInfoKHR
@@ -5703,7 +5703,7 @@ struct VkVideoPictureResourceKHR
        const void*             pNext;
        VkOffset2D              codedOffset;
        VkExtent2D              codedExtent;
-       deUint32                baseArrayLayer;
+       uint32_t                baseArrayLayer;
        VkImageView             imageViewBinding;
 };
 
@@ -5719,7 +5719,7 @@ struct VkVideoGetMemoryPropertiesKHR
 {
        VkStructureType                 sType;
        const void*                             pNext;
-       deUint32                                memoryBindIndex;
+       uint32_t                                memoryBindIndex;
        VkMemoryRequirements2*  pMemoryRequirements;
 };
 
@@ -5727,7 +5727,7 @@ struct VkVideoBindMemoryKHR
 {
        VkStructureType sType;
        const void*             pNext;
-       deUint32                memoryBindIndex;
+       uint32_t                memoryBindIndex;
        VkDeviceMemory  memory;
        VkDeviceSize    memoryOffset;
        VkDeviceSize    memorySize;
@@ -5737,14 +5737,14 @@ struct VkVideoSessionCreateInfoKHR
 {
        VkStructureType                                 sType;
        const void*                                             pNext;
-       deUint32                                                queueFamilyIndex;
+       uint32_t                                                queueFamilyIndex;
        VkVideoSessionCreateFlagsKHR    flags;
        const VkVideoProfileKHR*                pVideoProfile;
        VkFormat                                                pictureFormat;
        VkExtent2D                                              maxCodedExtent;
        VkFormat                                                referencePicturesFormat;
-       deUint32                                                maxReferencePicturesSlotsCount;
-       deUint32                                                maxReferencePicturesActiveCount;
+       uint32_t                                                maxReferencePicturesSlotsCount;
+       uint32_t                                                maxReferencePicturesActiveCount;
 };
 
 struct VkVideoSessionParametersCreateInfoKHR
@@ -5759,7 +5759,7 @@ struct VkVideoSessionParametersUpdateInfoKHR
 {
        VkStructureType sType;
        const void*             pNext;
-       deUint32                updateSequenceCount;
+       uint32_t                updateSequenceCount;
 };
 
 struct VkVideoBeginCodingInfoKHR
@@ -5770,7 +5770,7 @@ struct VkVideoBeginCodingInfoKHR
        VkVideoCodingQualityPresetFlagsKHR      codecQualityPreset;
        VkVideoSessionKHR                                       videoSession;
        VkVideoSessionParametersKHR                     videoSessionParameters;
-       deUint32                                                        referenceSlotCount;
+       uint32_t                                                        referenceSlotCount;
        const VkVideoReferenceSlotKHR*          pReferenceSlots;
 };
 
@@ -5800,7 +5800,7 @@ struct VkVideoDecodeInfoKHR
        VkDeviceSize                                    srcBufferRange;
        VkVideoPictureResourceKHR               dstPictureResource;
        const VkVideoReferenceSlotKHR*  pSetupReferenceSlot;
-       deUint32                                                referenceSlotCount;
+       uint32_t                                                referenceSlotCount;
        const VkVideoReferenceSlotKHR*  pReferenceSlots;
 };
 
@@ -5829,7 +5829,7 @@ struct VkPhysicalDevicePortabilitySubsetPropertiesKHR
 {
        VkStructureType sType;
        void*                   pNext;
-       deUint32                minVertexInputBindingStrideAlignment;
+       uint32_t                minVertexInputBindingStrideAlignment;
 };
 
 struct VkVideoEncodeInfoKHR
@@ -5837,14 +5837,14 @@ struct VkVideoEncodeInfoKHR
        VkStructureType                                 sType;
        const void*                                             pNext;
        VkVideoEncodeFlagsKHR                   flags;
-       deUint32                                                qualityLevel;
+       uint32_t                                                qualityLevel;
        VkExtent2D                                              codedExtent;
        VkBuffer                                                dstBitstreamBuffer;
        VkDeviceSize                                    dstBitstreamBufferOffset;
        VkDeviceSize                                    dstBitstreamBufferMaxRange;
        VkVideoPictureResourceKHR               srcPictureResource;
        const VkVideoReferenceSlotKHR*  pSetupReferenceSlot;
-       deUint32                                                referenceSlotCount;
+       uint32_t                                                referenceSlotCount;
        const VkVideoReferenceSlotKHR*  pReferenceSlots;
 };
 
@@ -5854,27 +5854,27 @@ struct VkVideoEncodeRateControlInfoKHR
        const void*                                                             pNext;
        VkVideoEncodeRateControlFlagsKHR                flags;
        VkVideoEncodeRateControlModeFlagBitsKHR rateControlMode;
-       deUint32                                                                averageBitrate;
+       uint32_t                                                                averageBitrate;
        deUint16                                                                peakToAverageBitrateRatio;
        deUint16                                                                frameRateNumerator;
        deUint16                                                                frameRateDenominator;
-       deUint32                                                                virtualBufferSizeInMs;
+       uint32_t                                                                virtualBufferSizeInMs;
 };
 
 struct StdVideoH264SpsVuiFlags
 {
-       deUint32        aspect_ratio_info_present_flag:1;
-       deUint32        overscan_info_present_flag:1;
-       deUint32        overscan_appropriate_flag:1;
-       deUint32        video_signal_type_present_flag:1;
-       deUint32        video_full_range_flag:1;
-       deUint32        color_description_present_flag:1;
-       deUint32        chroma_loc_info_present_flag:1;
-       deUint32        timing_info_present_flag:1;
-       deUint32        fixed_frame_rate_flag:1;
-       deUint32        bitstream_restriction_flag:1;
-       deUint32        nal_hrd_parameters_present_flag:1;
-       deUint32        vcl_hrd_parameters_present_flag:1;
+       uint32_t        aspect_ratio_info_present_flag:1;
+       uint32_t        overscan_info_present_flag:1;
+       uint32_t        overscan_appropriate_flag:1;
+       uint32_t        video_signal_type_present_flag:1;
+       uint32_t        video_full_range_flag:1;
+       uint32_t        color_description_present_flag:1;
+       uint32_t        chroma_loc_info_present_flag:1;
+       uint32_t        timing_info_present_flag:1;
+       uint32_t        fixed_frame_rate_flag:1;
+       uint32_t        bitstream_restriction_flag:1;
+       uint32_t        nal_hrd_parameters_present_flag:1;
+       uint32_t        vcl_hrd_parameters_present_flag:1;
 };
 
 struct StdVideoH264HrdParameters
@@ -5882,13 +5882,13 @@ struct StdVideoH264HrdParameters
        deUint8         cpb_cnt_minus1;
        deUint8         bit_rate_scale;
        deUint8         cpb_size_scale;
-       deUint32        bit_rate_value_minus1[32];
-       deUint32        cpb_size_value_minus1[32];
+       uint32_t        bit_rate_value_minus1[32];
+       uint32_t        cpb_size_value_minus1[32];
        deUint8         cbr_flag[32];
-       deUint32        initial_cpb_removal_delay_length_minus1;
-       deUint32        cpb_removal_delay_length_minus1;
-       deUint32        dpb_output_delay_length_minus1;
-       deUint32        time_offset_length;
+       uint32_t        initial_cpb_removal_delay_length_minus1;
+       uint32_t        cpb_removal_delay_length_minus1;
+       uint32_t        dpb_output_delay_length_minus1;
+       uint32_t        time_offset_length;
 };
 
 struct StdVideoH264SequenceParameterSetVui
@@ -5900,8 +5900,8 @@ struct StdVideoH264SequenceParameterSetVui
        deUint8                                         color_primaries;
        deUint8                                         transfer_characteristics;
        deUint8                                         matrix_coefficients;
-       deUint32                                        num_units_in_tick;
-       deUint32                                        time_scale;
+       uint32_t                                        num_units_in_tick;
+       uint32_t                                        time_scale;
        StdVideoH264HrdParameters       hrd_parameters;
        deUint8                                         num_reorder_frames;
        deUint8                                         max_dec_frame_buffering;
@@ -5910,23 +5910,23 @@ struct StdVideoH264SequenceParameterSetVui
 
 struct StdVideoH264SpsFlags
 {
-       deUint32        constraint_set0_flag:1;
-       deUint32        constraint_set1_flag:1;
-       deUint32        constraint_set2_flag:1;
-       deUint32        constraint_set3_flag:1;
-       deUint32        constraint_set4_flag:1;
-       deUint32        constraint_set5_flag:1;
-       deUint32        direct_8x8_inference_flag:1;
-       deUint32        mb_adaptive_frame_field_flag:1;
-       deUint32        frame_mbs_only_flag:1;
-       deUint32        delta_pic_order_always_zero_flag:1;
-       deUint32        residual_colour_transform_flag:1;
-       deUint32        gaps_in_frame_num_value_allowed_flag:1;
-       deUint32        first_picture_after_seek_flag:1;
-       deUint32        qpprime_y_zero_transform_bypass_flag:1;
-       deUint32        frame_cropping_flag:1;
-       deUint32        scaling_matrix_present_flag:1;
-       deUint32        vui_parameters_present_flag:1;
+       uint32_t        constraint_set0_flag:1;
+       uint32_t        constraint_set1_flag:1;
+       uint32_t        constraint_set2_flag:1;
+       uint32_t        constraint_set3_flag:1;
+       uint32_t        constraint_set4_flag:1;
+       uint32_t        constraint_set5_flag:1;
+       uint32_t        direct_8x8_inference_flag:1;
+       uint32_t        mb_adaptive_frame_field_flag:1;
+       uint32_t        frame_mbs_only_flag:1;
+       uint32_t        delta_pic_order_always_zero_flag:1;
+       uint32_t        residual_colour_transform_flag:1;
+       uint32_t        gaps_in_frame_num_value_allowed_flag:1;
+       uint32_t        first_picture_after_seek_flag:1;
+       uint32_t        qpprime_y_zero_transform_bypass_flag:1;
+       uint32_t        frame_cropping_flag:1;
+       uint32_t        scaling_matrix_present_flag:1;
+       uint32_t        vui_parameters_present_flag:1;
 };
 
 struct StdVideoH264ScalingLists
@@ -5948,33 +5948,33 @@ struct StdVideoH264SequenceParameterSet
        deUint8                                                                 log2_max_frame_num_minus4;
        StdVideoH264PocType                                             pic_order_cnt_type;
        deUint8                                                                 log2_max_pic_order_cnt_lsb_minus4;
-       deInt32                                                                 offset_for_non_ref_pic;
-       deInt32                                                                 offset_for_top_to_bottom_field;
+       int32_t                                                                 offset_for_non_ref_pic;
+       int32_t                                                                 offset_for_top_to_bottom_field;
        deUint8                                                                 num_ref_frames_in_pic_order_cnt_cycle;
        deUint8                                                                 max_num_ref_frames;
-       deUint32                                                                pic_width_in_mbs_minus1;
-       deUint32                                                                pic_height_in_map_units_minus1;
-       deUint32                                                                frame_crop_left_offset;
-       deUint32                                                                frame_crop_right_offset;
-       deUint32                                                                frame_crop_top_offset;
-       deUint32                                                                frame_crop_bottom_offset;
+       uint32_t                                                                pic_width_in_mbs_minus1;
+       uint32_t                                                                pic_height_in_map_units_minus1;
+       uint32_t                                                                frame_crop_left_offset;
+       uint32_t                                                                frame_crop_right_offset;
+       uint32_t                                                                frame_crop_top_offset;
+       uint32_t                                                                frame_crop_bottom_offset;
        StdVideoH264SpsFlags                                    flags;
-       deInt32                                                                 offset_for_ref_frame[255];
+       int32_t                                                                 offset_for_ref_frame[255];
        StdVideoH264ScalingLists*                               pScalingLists;
        StdVideoH264SequenceParameterSetVui*    pSequenceParameterSetVui;
 };
 
 struct StdVideoH264PpsFlags
 {
-       deUint32        transform_8x8_mode_flag:1;
-       deUint32        redundant_pic_cnt_present_flag:1;
-       deUint32        constrained_intra_pred_flag:1;
-       deUint32        deblocking_filter_control_present_flag:1;
-       deUint32        weighted_bipred_idc_flag:1;
-       deUint32        weighted_pred_flag:1;
-       deUint32        pic_order_present_flag:1;
-       deUint32        entropy_coding_mode_flag:1;
-       deUint32        scaling_matrix_present_flag:1;
+       uint32_t        transform_8x8_mode_flag:1;
+       uint32_t        redundant_pic_cnt_present_flag:1;
+       uint32_t        constrained_intra_pred_flag:1;
+       uint32_t        deblocking_filter_control_present_flag:1;
+       uint32_t        weighted_bipred_idc_flag:1;
+       uint32_t        weighted_pred_flag:1;
+       uint32_t        pic_order_present_flag:1;
+       uint32_t        entropy_coding_mode_flag:1;
+       uint32_t        scaling_matrix_present_flag:1;
 };
 
 struct StdVideoH264PictureParameterSet
@@ -5994,26 +5994,26 @@ struct StdVideoH264PictureParameterSet
 
 struct StdVideoEncodeH264SliceHeaderFlags
 {
-       deUint32        idr_flag:1;
-       deUint32        is_reference_flag:1;
-       deUint32        num_ref_idx_active_override_flag:1;
-       deUint32        no_output_of_prior_pics_flag:1;
-       deUint32        long_term_reference_flag:1;
-       deUint32        adaptive_ref_pic_marking_mode_flag:1;
-       deUint32        no_prior_references_available_flag:1;
+       uint32_t        idr_flag:1;
+       uint32_t        is_reference_flag:1;
+       uint32_t        num_ref_idx_active_override_flag:1;
+       uint32_t        no_output_of_prior_pics_flag:1;
+       uint32_t        long_term_reference_flag:1;
+       uint32_t        adaptive_ref_pic_marking_mode_flag:1;
+       uint32_t        no_prior_references_available_flag:1;
 };
 
 struct StdVideoEncodeH264PictureInfoFlags
 {
-       deUint32        idr_flag:1;
-       deUint32        is_reference_flag:1;
-       deUint32        long_term_reference_flag:1;
+       uint32_t        idr_flag:1;
+       uint32_t        is_reference_flag:1;
+       uint32_t        long_term_reference_flag:1;
 };
 
 struct StdVideoEncodeH264RefMgmtFlags
 {
-       deUint32        ref_pic_list_modification_l0_flag:1;
-       deUint32        ref_pic_list_modification_l1_flag:1;
+       uint32_t        ref_pic_list_modification_l0_flag:1;
+       uint32_t        ref_pic_list_modification_l1_flag:1;
 };
 
 struct StdVideoEncodeH264RefListModEntry
@@ -6047,8 +6047,8 @@ struct StdVideoEncodeH264PictureInfo
 {
        StdVideoEncodeH264PictureInfoFlags      flags;
        StdVideoH264PictureType                         pictureType;
-       deUint32                                                        frameNum;
-       deUint32                                                        pictureOrderCount;
+       uint32_t                                                        frameNum;
+       uint32_t                                                        pictureOrderCount;
        deUint16                                                        long_term_pic_num;
        deUint16                                                        long_term_frame_idx;
 };
@@ -6099,9 +6099,9 @@ struct VkVideoEncodeH264SessionParametersAddInfoEXT
 {
        VkStructureType                                                 sType;
        const void*                                                             pNext;
-       deUint32                                                                spsStdCount;
+       uint32_t                                                                spsStdCount;
        const StdVideoH264SequenceParameterSet* pSpsStd;
-       deUint32                                                                ppsStdCount;
+       uint32_t                                                                ppsStdCount;
        const StdVideoH264PictureParameterSet*  pPpsStd;
 };
 
@@ -6109,8 +6109,8 @@ struct VkVideoEncodeH264SessionParametersCreateInfoEXT
 {
        VkStructureType                                                                         sType;
        const void*                                                                                     pNext;
-       deUint32                                                                                        maxSpsStdCount;
-       deUint32                                                                                        maxPpsStdCount;
+       uint32_t                                                                                        maxSpsStdCount;
+       uint32_t                                                                                        maxPpsStdCount;
        const VkVideoEncodeH264SessionParametersAddInfoEXT*     pParametersAddInfo;
 };
 
@@ -6127,12 +6127,12 @@ struct VkVideoEncodeH264NaluSliceEXT
        VkStructureType                                                 sType;
        const void*                                                             pNext;
        const StdVideoEncodeH264SliceHeader*    pSliceHeaderStd;
-       deUint32                                                                mbCount;
+       uint32_t                                                                mbCount;
        deUint8                                                                 refFinalList0EntryCount;
        const VkVideoEncodeH264DpbSlotInfoEXT*  pRefFinalList0Entries;
        deUint8                                                                 refFinalList1EntryCount;
        const VkVideoEncodeH264DpbSlotInfoEXT*  pRefFinalList1Entries;
-       deUint32                                                                precedingNaluBytes;
+       uint32_t                                                                precedingNaluBytes;
        deUint8                                                                 minQp;
        deUint8                                                                 maxQp;
 };
@@ -6145,7 +6145,7 @@ struct VkVideoEncodeH264VclFrameInfoEXT
        const VkVideoEncodeH264DpbSlotInfoEXT*  pRefDefaultFinalList0Entries;
        deUint8                                                                 refDefaultFinalList1EntryCount;
        const VkVideoEncodeH264DpbSlotInfoEXT*  pRefDefaultFinalList1Entries;
-       deUint32                                                                naluSliceEntryCount;
+       uint32_t                                                                naluSliceEntryCount;
        const VkVideoEncodeH264NaluSliceEXT*    pNaluSliceEntries;
        const VkVideoEncodeH264DpbSlotInfoEXT*  pCurrentPictureInfo;
 };
@@ -6156,7 +6156,7 @@ struct VkVideoEncodeH264EmitPictureParametersEXT
        const void*             pNext;
        deUint8                 spsId;
        VkBool32                emitSpsEnable;
-       deUint32                ppsIdEntryCount;
+       uint32_t                ppsIdEntryCount;
        const deUint8*  ppsIdEntries;
 };
 
@@ -6169,11 +6169,11 @@ struct VkVideoEncodeH264ProfileEXT
 
 struct StdVideoDecodeH264PictureInfoFlags
 {
-       deUint32        field_pic_flag:1;
-       deUint32        is_intra:1;
-       deUint32        bottom_field_flag:1;
-       deUint32        is_reference:1;
-       deUint32        complementary_field_pair:1;
+       uint32_t        field_pic_flag:1;
+       uint32_t        is_intra:1;
+       uint32_t        bottom_field_flag:1;
+       uint32_t        is_reference:1;
+       uint32_t        complementary_field_pair:1;
 };
 
 struct StdVideoDecodeH264PictureInfo
@@ -6183,31 +6183,31 @@ struct StdVideoDecodeH264PictureInfo
        deUint16                                                        reserved;
        deUint16                                                        frame_num;
        deUint16                                                        idr_pic_id;
-       deInt32                                                         PicOrderCnt[2];
+       int32_t                                                         PicOrderCnt[2];
        StdVideoDecodeH264PictureInfoFlags      flags;
 };
 
 struct StdVideoDecodeH264ReferenceInfoFlags
 {
-       deUint32        top_field_flag:1;
-       deUint32        bottom_field_flag:1;
-       deUint32        is_long_term:1;
-       deUint32        is_non_existing:1;
+       uint32_t        top_field_flag:1;
+       uint32_t        bottom_field_flag:1;
+       uint32_t        is_long_term:1;
+       uint32_t        is_non_existing:1;
 };
 
 struct StdVideoDecodeH264ReferenceInfo
 {
        deUint16                                                                FrameNum;
        deUint16                                                                reserved;
-       deInt32                                                                 PicOrderCnt[2];
+       int32_t                                                                 PicOrderCnt[2];
        StdVideoDecodeH264ReferenceInfoFlags    flags;
 };
 
 struct StdVideoDecodeH264MvcElementFlags
 {
-       deUint32        non_idr:1;
-       deUint32        anchor_pic:1;
-       deUint32        inter_view:1;
+       uint32_t        non_idr:1;
+       uint32_t        anchor_pic:1;
+       uint32_t        inter_view:1;
 };
 
 struct StdVideoDecodeH264MvcElement
@@ -6229,8 +6229,8 @@ struct StdVideoDecodeH264MvcElement
 
 struct StdVideoDecodeH264Mvc
 {
-       deUint32                                                viewId0;
-       deUint32                                                mvcElementCount;
+       uint32_t                                                viewId0;
+       uint32_t                                                mvcElementCount;
        StdVideoDecodeH264MvcElement*   pMvcElements;
 };
 
@@ -6246,7 +6246,7 @@ struct VkVideoDecodeH264CapabilitiesEXT
 {
        VkStructureType                 sType;
        void*                                   pNext;
-       deUint32                                maxLevel;
+       uint32_t                                maxLevel;
        VkOffset2D                              fieldOffsetGranularity;
        VkExtensionProperties   stdExtensionVersion;
 };
@@ -6263,9 +6263,9 @@ struct VkVideoDecodeH264SessionParametersAddInfoEXT
 {
        VkStructureType                                                 sType;
        const void*                                                             pNext;
-       deUint32                                                                spsStdCount;
+       uint32_t                                                                spsStdCount;
        const StdVideoH264SequenceParameterSet* pSpsStd;
-       deUint32                                                                ppsStdCount;
+       uint32_t                                                                ppsStdCount;
        const StdVideoH264PictureParameterSet*  pPpsStd;
 };
 
@@ -6273,8 +6273,8 @@ struct VkVideoDecodeH264SessionParametersCreateInfoEXT
 {
        VkStructureType                                                                         sType;
        const void*                                                                                     pNext;
-       deUint32                                                                                        maxSpsStdCount;
-       deUint32                                                                                        maxPpsStdCount;
+       uint32_t                                                                                        maxSpsStdCount;
+       uint32_t                                                                                        maxPpsStdCount;
        const VkVideoDecodeH264SessionParametersAddInfoEXT*     pParametersAddInfo;
 };
 
@@ -6283,8 +6283,8 @@ struct VkVideoDecodeH264PictureInfoEXT
        VkStructureType                                                 sType;
        const void*                                                             pNext;
        const StdVideoDecodeH264PictureInfo*    pStdPictureInfo;
-       deUint32                                                                slicesCount;
-       const deUint32*                                                 pSlicesDataOffsets;
+       uint32_t                                                                slicesCount;
+       const uint32_t*                                                 pSlicesDataOffsets;
 };
 
 struct VkVideoDecodeH264MvcEXT
@@ -6303,26 +6303,26 @@ struct VkVideoDecodeH264DpbSlotInfoEXT
 
 struct StdVideoH265DecPicBufMgr
 {
-       deUint32        max_latency_increase_plus1[7];
+       uint32_t        max_latency_increase_plus1[7];
        deUint8         max_dec_pic_buffering_minus1[7];
        deUint8         max_num_reorder_pics[7];
 };
 
 struct StdVideoH265SubLayerHrdParameters
 {
-       deUint32        bit_rate_value_minus1[32];
-       deUint32        cpb_size_value_minus1[32];
-       deUint32        cpb_size_du_value_minus1[32];
-       deUint32        bit_rate_du_value_minus1[32];
-       deUint32        cbr_flag;
+       uint32_t        bit_rate_value_minus1[32];
+       uint32_t        cpb_size_value_minus1[32];
+       uint32_t        cpb_size_du_value_minus1[32];
+       uint32_t        bit_rate_du_value_minus1[32];
+       uint32_t        cbr_flag;
 };
 
 struct StdVideoH265HrdFlags
 {
-       deUint32        nal_hrd_parameters_present_flag:1;
-       deUint32        vcl_hrd_parameters_present_flag:1;
-       deUint32        sub_pic_hrd_params_present_flag:1;
-       deUint32        sub_pic_cpb_params_in_pic_timing_sei_flag:1;
+       uint32_t        nal_hrd_parameters_present_flag:1;
+       uint32_t        vcl_hrd_parameters_present_flag:1;
+       uint32_t        sub_pic_hrd_params_present_flag:1;
+       uint32_t        sub_pic_cpb_params_in_pic_timing_sei_flag:1;
        deUint8         fixed_pic_rate_general_flag;
        deUint8         fixed_pic_rate_within_cvs_flag;
        deUint8         low_delay_hrd_flag;
@@ -6348,19 +6348,19 @@ struct StdVideoH265HrdParameters
 
 struct StdVideoH265VpsFlags
 {
-       deUint32        vps_temporal_id_nesting_flag:1;
-       deUint32        vps_sub_layer_ordering_info_present_flag:1;
-       deUint32        vps_timing_info_present_flag:1;
-       deUint32        vps_poc_proportional_to_timing_flag:1;
+       uint32_t        vps_temporal_id_nesting_flag:1;
+       uint32_t        vps_sub_layer_ordering_info_present_flag:1;
+       uint32_t        vps_timing_info_present_flag:1;
+       uint32_t        vps_poc_proportional_to_timing_flag:1;
 };
 
 struct StdVideoH265VideoParameterSet
 {
        deUint8                                         vps_video_parameter_set_id;
        deUint8                                         vps_max_sub_layers_minus1;
-       deUint32                                        vps_num_units_in_tick;
-       deUint32                                        vps_time_scale;
-       deUint32                                        vps_num_ticks_poc_diff_one_minus1;
+       uint32_t                                        vps_num_units_in_tick;
+       uint32_t                                        vps_time_scale;
+       uint32_t                                        vps_num_ticks_poc_diff_one_minus1;
        StdVideoH265DecPicBufMgr*       pDecPicBufMgr;
        StdVideoH265HrdParameters*      hrd_parameters;
        StdVideoH265VpsFlags            flags;
@@ -6378,24 +6378,24 @@ struct StdVideoH265ScalingLists
 
 struct StdVideoH265SpsVuiFlags
 {
-       deUint32        aspect_ratio_info_present_flag:1;
-       deUint32        overscan_info_present_flag:1;
-       deUint32        overscan_appropriate_flag:1;
-       deUint32        video_signal_type_present_flag:1;
-       deUint32        video_full_range_flag:1;
-       deUint32        colour_description_present_flag:1;
-       deUint32        chroma_loc_info_present_flag:1;
-       deUint32        neutral_chroma_indication_flag:1;
-       deUint32        field_seq_flag:1;
-       deUint32        frame_field_info_present_flag:1;
-       deUint32        default_display_window_flag:1;
-       deUint32        vui_timing_info_present_flag:1;
-       deUint32        vui_poc_proportional_to_timing_flag:1;
-       deUint32        vui_hrd_parameters_present_flag:1;
-       deUint32        bitstream_restriction_flag:1;
-       deUint32        tiles_fixed_structure_flag:1;
-       deUint32        motion_vectors_over_pic_boundaries_flag:1;
-       deUint32        restricted_ref_pic_lists_flag:1;
+       uint32_t        aspect_ratio_info_present_flag:1;
+       uint32_t        overscan_info_present_flag:1;
+       uint32_t        overscan_appropriate_flag:1;
+       uint32_t        video_signal_type_present_flag:1;
+       uint32_t        video_full_range_flag:1;
+       uint32_t        colour_description_present_flag:1;
+       uint32_t        chroma_loc_info_present_flag:1;
+       uint32_t        neutral_chroma_indication_flag:1;
+       uint32_t        field_seq_flag:1;
+       uint32_t        frame_field_info_present_flag:1;
+       uint32_t        default_display_window_flag:1;
+       uint32_t        vui_timing_info_present_flag:1;
+       uint32_t        vui_poc_proportional_to_timing_flag:1;
+       uint32_t        vui_hrd_parameters_present_flag:1;
+       uint32_t        bitstream_restriction_flag:1;
+       uint32_t        tiles_fixed_structure_flag:1;
+       uint32_t        motion_vectors_over_pic_boundaries_flag:1;
+       uint32_t        restricted_ref_pic_lists_flag:1;
 };
 
 struct StdVideoH265SequenceParameterSetVui
@@ -6413,9 +6413,9 @@ struct StdVideoH265SequenceParameterSetVui
        deUint16                                        def_disp_win_right_offset;
        deUint16                                        def_disp_win_top_offset;
        deUint16                                        def_disp_win_bottom_offset;
-       deUint32                                        vui_num_units_in_tick;
-       deUint32                                        vui_time_scale;
-       deUint32                                        vui_num_ticks_poc_diff_one_minus1;
+       uint32_t                                        vui_num_units_in_tick;
+       uint32_t                                        vui_time_scale;
+       uint32_t                                        vui_num_ticks_poc_diff_one_minus1;
        StdVideoH265HrdParameters*      hrd_parameters;
        deUint16                                        min_spatial_segmentation_idc;
        deUint8                                         max_bytes_per_pic_denom;
@@ -6432,41 +6432,41 @@ struct StdVideoH265PredictorPaletteEntries
 
 struct StdVideoH265SpsFlags
 {
-       deUint32        sps_temporal_id_nesting_flag:1;
-       deUint32        separate_colour_plane_flag:1;
-       deUint32        scaling_list_enabled_flag:1;
-       deUint32        sps_scaling_list_data_present_flag:1;
-       deUint32        amp_enabled_flag:1;
-       deUint32        sample_adaptive_offset_enabled_flag:1;
-       deUint32        pcm_enabled_flag:1;
-       deUint32        pcm_loop_filter_disabled_flag:1;
-       deUint32        long_term_ref_pics_present_flag:1;
-       deUint32        sps_temporal_mvp_enabled_flag:1;
-       deUint32        strong_intra_smoothing_enabled_flag:1;
-       deUint32        vui_parameters_present_flag:1;
-       deUint32        sps_extension_present_flag:1;
-       deUint32        sps_range_extension_flag:1;
-       deUint32        transform_skip_rotation_enabled_flag:1;
-       deUint32        transform_skip_context_enabled_flag:1;
-       deUint32        implicit_rdpcm_enabled_flag:1;
-       deUint32        explicit_rdpcm_enabled_flag:1;
-       deUint32        extended_precision_processing_flag:1;
-       deUint32        intra_smoothing_disabled_flag:1;
-       deUint32        high_precision_offsets_enabled_flag:1;
-       deUint32        persistent_rice_adaptation_enabled_flag:1;
-       deUint32        cabac_bypass_alignment_enabled_flag:1;
-       deUint32        sps_curr_pic_ref_enabled_flag:1;
-       deUint32        palette_mode_enabled_flag:1;
-       deUint32        sps_palette_predictor_initializer_present_flag:1;
-       deUint32        intra_boundary_filtering_disabled_flag:1;
+       uint32_t        sps_temporal_id_nesting_flag:1;
+       uint32_t        separate_colour_plane_flag:1;
+       uint32_t        scaling_list_enabled_flag:1;
+       uint32_t        sps_scaling_list_data_present_flag:1;
+       uint32_t        amp_enabled_flag:1;
+       uint32_t        sample_adaptive_offset_enabled_flag:1;
+       uint32_t        pcm_enabled_flag:1;
+       uint32_t        pcm_loop_filter_disabled_flag:1;
+       uint32_t        long_term_ref_pics_present_flag:1;
+       uint32_t        sps_temporal_mvp_enabled_flag:1;
+       uint32_t        strong_intra_smoothing_enabled_flag:1;
+       uint32_t        vui_parameters_present_flag:1;
+       uint32_t        sps_extension_present_flag:1;
+       uint32_t        sps_range_extension_flag:1;
+       uint32_t        transform_skip_rotation_enabled_flag:1;
+       uint32_t        transform_skip_context_enabled_flag:1;
+       uint32_t        implicit_rdpcm_enabled_flag:1;
+       uint32_t        explicit_rdpcm_enabled_flag:1;
+       uint32_t        extended_precision_processing_flag:1;
+       uint32_t        intra_smoothing_disabled_flag:1;
+       uint32_t        high_precision_offsets_enabled_flag:1;
+       uint32_t        persistent_rice_adaptation_enabled_flag:1;
+       uint32_t        cabac_bypass_alignment_enabled_flag:1;
+       uint32_t        sps_curr_pic_ref_enabled_flag:1;
+       uint32_t        palette_mode_enabled_flag:1;
+       uint32_t        sps_palette_predictor_initializer_present_flag:1;
+       uint32_t        intra_boundary_filtering_disabled_flag:1;
 };
 
 struct StdVideoH265SequenceParameterSet
 {
        StdVideoH265ProfileIdc                                  profile_idc;
        StdVideoH265Level                                               level_idc;
-       deUint32                                                                pic_width_in_luma_samples;
-       deUint32                                                                pic_height_in_luma_samples;
+       uint32_t                                                                pic_width_in_luma_samples;
+       uint32_t                                                                pic_height_in_luma_samples;
        deUint8                                                                 sps_video_parameter_set_id;
        deUint8                                                                 sps_max_sub_layers_minus1;
        deUint8                                                                 sps_seq_parameter_set_id;
@@ -6487,10 +6487,10 @@ struct StdVideoH265SequenceParameterSet
        deUint8                                                                 pcm_sample_bit_depth_chroma_minus1;
        deUint8                                                                 log2_min_pcm_luma_coding_block_size_minus3;
        deUint8                                                                 log2_diff_max_min_pcm_luma_coding_block_size;
-       deUint32                                                                conf_win_left_offset;
-       deUint32                                                                conf_win_right_offset;
-       deUint32                                                                conf_win_top_offset;
-       deUint32                                                                conf_win_bottom_offset;
+       uint32_t                                                                conf_win_left_offset;
+       uint32_t                                                                conf_win_right_offset;
+       uint32_t                                                                conf_win_top_offset;
+       uint32_t                                                                conf_win_bottom_offset;
        StdVideoH265DecPicBufMgr*                               pDecPicBufMgr;
        StdVideoH265SpsFlags                                    flags;
        StdVideoH265ScalingLists*                               pScalingLists;
@@ -6504,37 +6504,37 @@ struct StdVideoH265SequenceParameterSet
 
 struct StdVideoH265PpsFlags
 {
-       deUint32        dependent_slice_segments_enabled_flag:1;
-       deUint32        output_flag_present_flag:1;
-       deUint32        sign_data_hiding_enabled_flag:1;
-       deUint32        cabac_init_present_flag:1;
-       deUint32        constrained_intra_pred_flag:1;
-       deUint32        transform_skip_enabled_flag:1;
-       deUint32        cu_qp_delta_enabled_flag:1;
-       deUint32        pps_slice_chroma_qp_offsets_present_flag:1;
-       deUint32        weighted_pred_flag:1;
-       deUint32        weighted_bipred_flag:1;
-       deUint32        transquant_bypass_enabled_flag:1;
-       deUint32        tiles_enabled_flag:1;
-       deUint32        entropy_coding_sync_enabled_flag:1;
-       deUint32        uniform_spacing_flag:1;
-       deUint32        loop_filter_across_tiles_enabled_flag:1;
-       deUint32        pps_loop_filter_across_slices_enabled_flag:1;
-       deUint32        deblocking_filter_control_present_flag:1;
-       deUint32        deblocking_filter_override_enabled_flag:1;
-       deUint32        pps_deblocking_filter_disabled_flag:1;
-       deUint32        pps_scaling_list_data_present_flag:1;
-       deUint32        lists_modification_present_flag:1;
-       deUint32        slice_segment_header_extension_present_flag:1;
-       deUint32        pps_extension_present_flag:1;
-       deUint32        cross_component_prediction_enabled_flag:1;
-       deUint32        chroma_qp_offset_list_enabled_flag:1;
-       deUint32        pps_curr_pic_ref_enabled_flag:1;
-       deUint32        residual_adaptive_colour_transform_enabled_flag:1;
-       deUint32        pps_slice_act_qp_offsets_present_flag:1;
-       deUint32        pps_palette_predictor_initializer_present_flag:1;
-       deUint32        monochrome_palette_flag:1;
-       deUint32        pps_range_extension_flag:1;
+       uint32_t        dependent_slice_segments_enabled_flag:1;
+       uint32_t        output_flag_present_flag:1;
+       uint32_t        sign_data_hiding_enabled_flag:1;
+       uint32_t        cabac_init_present_flag:1;
+       uint32_t        constrained_intra_pred_flag:1;
+       uint32_t        transform_skip_enabled_flag:1;
+       uint32_t        cu_qp_delta_enabled_flag:1;
+       uint32_t        pps_slice_chroma_qp_offsets_present_flag:1;
+       uint32_t        weighted_pred_flag:1;
+       uint32_t        weighted_bipred_flag:1;
+       uint32_t        transquant_bypass_enabled_flag:1;
+       uint32_t        tiles_enabled_flag:1;
+       uint32_t        entropy_coding_sync_enabled_flag:1;
+       uint32_t        uniform_spacing_flag:1;
+       uint32_t        loop_filter_across_tiles_enabled_flag:1;
+       uint32_t        pps_loop_filter_across_slices_enabled_flag:1;
+       uint32_t        deblocking_filter_control_present_flag:1;
+       uint32_t        deblocking_filter_override_enabled_flag:1;
+       uint32_t        pps_deblocking_filter_disabled_flag:1;
+       uint32_t        pps_scaling_list_data_present_flag:1;
+       uint32_t        lists_modification_present_flag:1;
+       uint32_t        slice_segment_header_extension_present_flag:1;
+       uint32_t        pps_extension_present_flag:1;
+       uint32_t        cross_component_prediction_enabled_flag:1;
+       uint32_t        chroma_qp_offset_list_enabled_flag:1;
+       uint32_t        pps_curr_pic_ref_enabled_flag:1;
+       uint32_t        residual_adaptive_colour_transform_enabled_flag:1;
+       uint32_t        pps_slice_act_qp_offsets_present_flag:1;
+       uint32_t        pps_palette_predictor_initializer_present_flag:1;
+       uint32_t        monochrome_palette_flag:1;
+       uint32_t        pps_range_extension_flag:1;
 };
 
 struct StdVideoH265PictureParameterSet
@@ -6575,10 +6575,10 @@ struct StdVideoH265PictureParameterSet
 
 struct StdVideoDecodeH265PictureInfoFlags
 {
-       deUint32        IrapPicFlag:1;
-       deUint32        IdrPicFlag:1;
-       deUint32        IsReference:1;
-       deUint32        short_term_ref_pic_set_sps_flag:1;
+       uint32_t        IrapPicFlag:1;
+       uint32_t        IdrPicFlag:1;
+       uint32_t        IsReference:1;
+       uint32_t        short_term_ref_pic_set_sps_flag:1;
 };
 
 struct StdVideoDecodeH265PictureInfo
@@ -6587,7 +6587,7 @@ struct StdVideoDecodeH265PictureInfo
        deUint8                                                         sps_seq_parameter_set_id;
        deUint8                                                         pps_pic_parameter_set_id;
        deUint8                                                         num_short_term_ref_pic_sets;
-       deInt32                                                         PicOrderCntVal;
+       int32_t                                                         PicOrderCntVal;
        deUint16                                                        NumBitsForSTRefPicSetInSlice;
        deUint8                                                         NumDeltaPocsOfRefRpsIdx;
        deUint8                                                         RefPicSetStCurrBefore[8];
@@ -6598,13 +6598,13 @@ struct StdVideoDecodeH265PictureInfo
 
 struct StdVideoDecodeH265ReferenceInfoFlags
 {
-       deUint32        is_long_term:1;
-       deUint32        is_non_existing:1;
+       uint32_t        is_long_term:1;
+       uint32_t        is_non_existing:1;
 };
 
 struct StdVideoDecodeH265ReferenceInfo
 {
-       deInt32                                                                 PicOrderCntVal;
+       int32_t                                                                 PicOrderCntVal;
        StdVideoDecodeH265ReferenceInfoFlags    flags;
 };
 
@@ -6619,7 +6619,7 @@ struct VkVideoDecodeH265CapabilitiesEXT
 {
        VkStructureType                 sType;
        void*                                   pNext;
-       deUint32                                maxLevel;
+       uint32_t                                maxLevel;
        VkExtensionProperties   stdExtensionVersion;
 };
 
@@ -6635,9 +6635,9 @@ struct VkVideoDecodeH265SessionParametersAddInfoEXT
 {
        VkStructureType                                                 sType;
        const void*                                                             pNext;
-       deUint32                                                                spsStdCount;
+       uint32_t                                                                spsStdCount;
        const StdVideoH265SequenceParameterSet* pSpsStd;
-       deUint32                                                                ppsStdCount;
+       uint32_t                                                                ppsStdCount;
        const StdVideoH265PictureParameterSet*  pPpsStd;
 };
 
@@ -6645,8 +6645,8 @@ struct VkVideoDecodeH265SessionParametersCreateInfoEXT
 {
        VkStructureType                                                                         sType;
        const void*                                                                                     pNext;
-       deUint32                                                                                        maxSpsStdCount;
-       deUint32                                                                                        maxPpsStdCount;
+       uint32_t                                                                                        maxSpsStdCount;
+       uint32_t                                                                                        maxPpsStdCount;
        const VkVideoDecodeH265SessionParametersAddInfoEXT*     pParametersAddInfo;
 };
 
@@ -6655,8 +6655,8 @@ struct VkVideoDecodeH265PictureInfoEXT
        VkStructureType                                 sType;
        const void*                                             pNext;
        StdVideoDecodeH265PictureInfo*  pStdPictureInfo;
-       deUint32                                                slicesCount;
-       const deUint32*                                 pSlicesDataOffsets;
+       uint32_t                                                slicesCount;
+       const uint32_t*                                 pSlicesDataOffsets;
 };
 
 struct VkVideoDecodeH265DpbSlotInfoEXT
@@ -6686,7 +6686,7 @@ struct VkMemoryZirconHandlePropertiesFUCHSIA
 {
        VkStructureType sType;
        void*                   pNext;
-       deUint32                memoryTypeBits;
+       uint32_t                memoryTypeBits;
 };
 
 struct VkMemoryGetZirconHandleInfoFUCHSIA
@@ -6802,7 +6802,7 @@ struct VkMemoryWin32HandlePropertiesKHR
 {
        VkStructureType sType;
        void*                   pNext;
-       deUint32                memoryTypeBits;
+       uint32_t                memoryTypeBits;
 };
 
 struct VkMemoryGetWin32HandleInfoKHR
@@ -6817,11 +6817,11 @@ struct VkWin32KeyedMutexAcquireReleaseInfoKHR
 {
        VkStructureType                 sType;
        const void*                             pNext;
-       deUint32                                acquireCount;
+       uint32_t                                acquireCount;
        const VkDeviceMemory*   pAcquireSyncs;
        const deUint64*                 pAcquireKeys;
-       const deUint32*                 pAcquireTimeouts;
-       deUint32                                releaseCount;
+       const uint32_t*                 pAcquireTimeouts;
+       uint32_t                                releaseCount;
        const VkDeviceMemory*   pReleaseSyncs;
        const deUint64*                 pReleaseKeys;
 };
@@ -6850,9 +6850,9 @@ struct VkD3D12FenceSubmitInfoKHR
 {
        VkStructureType sType;
        const void*             pNext;
-       deUint32                waitSemaphoreValuesCount;
+       uint32_t                waitSemaphoreValuesCount;
        const deUint64* pWaitSemaphoreValues;
-       deUint32                signalSemaphoreValuesCount;
+       uint32_t                signalSemaphoreValuesCount;
        const deUint64* pSignalSemaphoreValues;
 };
 
@@ -6912,11 +6912,11 @@ struct VkWin32KeyedMutexAcquireReleaseInfoNV
 {
        VkStructureType                 sType;
        const void*                             pNext;
-       deUint32                                acquireCount;
+       uint32_t                                acquireCount;
        const VkDeviceMemory*   pAcquireSyncs;
        const deUint64*                 pAcquireKeys;
-       const deUint32*                 pAcquireTimeoutMilliseconds;
-       deUint32                                releaseCount;
+       const uint32_t*                 pAcquireTimeoutMilliseconds;
+       uint32_t                                releaseCount;
        const VkDeviceMemory*   pReleaseSyncs;
        const deUint64*                 pReleaseKeys;
 };
index 0b50966..ed5a8a2 100644 (file)
@@ -2,7 +2,7 @@
  * be lost! Modify the generating script instead.
  */
 
-void getCoreDeviceExtensionsImpl (deUint32 coreVersion, ::std::vector<const char*>& dst)
+void getCoreDeviceExtensionsImpl (uint32_t coreVersion, ::std::vector<const char*>& dst)
 {
        if (coreVersion >= VK_API_VERSION_1_2)
        {
@@ -54,7 +54,7 @@ void getCoreDeviceExtensionsImpl (deUint32 coreVersion, ::std::vector<const char
        }
 }
 
-void getCoreInstanceExtensionsImpl (deUint32 coreVersion, ::std::vector<const char*>& dst)
+void getCoreInstanceExtensionsImpl (uint32_t coreVersion, ::std::vector<const char*>& dst)
 {
        if (coreVersion >= VK_API_VERSION_1_1)
        {
index b21e888..c69916a 100644 (file)
@@ -2,7 +2,7 @@
  * be lost! Modify the generating script instead.
  */
 
-inline VkExtent2D makeExtent2D (deUint32 width, deUint32 height)
+inline VkExtent2D makeExtent2D (uint32_t width, uint32_t height)
 {
        VkExtent2D res;
        res.width       = width;
@@ -10,7 +10,7 @@ inline VkExtent2D makeExtent2D (deUint32 width, deUint32 height)
        return res;
 }
 
-inline VkExtent3D makeExtent3D (deUint32 width, deUint32 height, deUint32 depth)
+inline VkExtent3D makeExtent3D (uint32_t width, uint32_t height, uint32_t depth)
 {
        VkExtent3D res;
        res.width       = width;
@@ -19,7 +19,7 @@ inline VkExtent3D makeExtent3D (deUint32 width, deUint32 height, deUint32 depth)
        return res;
 }
 
-inline VkOffset2D makeOffset2D (deInt32 x, deInt32 y)
+inline VkOffset2D makeOffset2D (int32_t x, int32_t y)
 {
        VkOffset2D res;
        res.x   = x;
@@ -27,7 +27,7 @@ inline VkOffset2D makeOffset2D (deInt32 x, deInt32 y)
        return res;
 }
 
-inline VkOffset3D makeOffset3D (deInt32 x, deInt32 y, deInt32 z)
+inline VkOffset3D makeOffset3D (int32_t x, int32_t y, int32_t z)
 {
        VkOffset3D res;
        res.x   = x;
@@ -36,7 +36,7 @@ inline VkOffset3D makeOffset3D (deInt32 x, deInt32 y, deInt32 z)
        return res;
 }
 
-inline VkDispatchIndirectCommand makeDispatchIndirectCommand (deUint32 x, deUint32 y, deUint32 z)
+inline VkDispatchIndirectCommand makeDispatchIndirectCommand (uint32_t x, uint32_t y, uint32_t z)
 {
        VkDispatchIndirectCommand res;
        res.x   = x;
@@ -45,7 +45,7 @@ inline VkDispatchIndirectCommand makeDispatchIndirectCommand (deUint32 x, deUint
        return res;
 }
 
-inline VkDrawIndexedIndirectCommand makeDrawIndexedIndirectCommand (deUint32 indexCount, deUint32 instanceCount, deUint32 firstIndex, deInt32 vertexOffset, deUint32 firstInstance)
+inline VkDrawIndexedIndirectCommand makeDrawIndexedIndirectCommand (uint32_t indexCount, uint32_t instanceCount, uint32_t firstIndex, int32_t vertexOffset, uint32_t firstInstance)
 {
        VkDrawIndexedIndirectCommand res;
        res.indexCount          = indexCount;
@@ -56,7 +56,7 @@ inline VkDrawIndexedIndirectCommand makeDrawIndexedIndirectCommand (deUint32 ind
        return res;
 }
 
-inline VkDrawIndirectCommand makeDrawIndirectCommand (deUint32 vertexCount, deUint32 instanceCount, deUint32 firstVertex, deUint32 firstInstance)
+inline VkDrawIndirectCommand makeDrawIndirectCommand (uint32_t vertexCount, uint32_t instanceCount, uint32_t firstVertex, uint32_t firstInstance)
 {
        VkDrawIndirectCommand res;
        res.vertexCount         = vertexCount;
@@ -66,7 +66,7 @@ inline VkDrawIndirectCommand makeDrawIndirectCommand (deUint32 vertexCount, deUi
        return res;
 }
 
-inline VkImageSubresourceRange makeImageSubresourceRange (VkImageAspectFlags aspectMask, deUint32 baseMipLevel, deUint32 levelCount, deUint32 baseArrayLayer, deUint32 layerCount)
+inline VkImageSubresourceRange makeImageSubresourceRange (VkImageAspectFlags aspectMask, uint32_t baseMipLevel, uint32_t levelCount, uint32_t baseArrayLayer, uint32_t layerCount)
 {
        VkImageSubresourceRange res;
        res.aspectMask          = aspectMask;
@@ -89,7 +89,7 @@ inline VkAllocationCallbacks makeAllocationCallbacks (void* pUserData, PFN_vkAll
        return res;
 }
 
-inline VkMemoryRequirements makeMemoryRequirements (VkDeviceSize size, VkDeviceSize alignment, deUint32 memoryTypeBits)
+inline VkMemoryRequirements makeMemoryRequirements (VkDeviceSize size, VkDeviceSize alignment, uint32_t memoryTypeBits)
 {
        VkMemoryRequirements res;
        res.size                        = size;
@@ -109,7 +109,7 @@ inline VkSparseMemoryBind makeSparseMemoryBind (VkDeviceSize resourceOffset, VkD
        return res;
 }
 
-inline VkSparseBufferMemoryBindInfo makeSparseBufferMemoryBindInfo (VkBuffer buffer, deUint32 bindCount, const VkSparseMemoryBind* pBinds)
+inline VkSparseBufferMemoryBindInfo makeSparseBufferMemoryBindInfo (VkBuffer buffer, uint32_t bindCount, const VkSparseMemoryBind* pBinds)
 {
        VkSparseBufferMemoryBindInfo res;
        res.buffer              = buffer;
@@ -118,7 +118,7 @@ inline VkSparseBufferMemoryBindInfo makeSparseBufferMemoryBindInfo (VkBuffer buf
        return res;
 }
 
-inline VkSparseImageOpaqueMemoryBindInfo makeSparseImageOpaqueMemoryBindInfo (VkImage image, deUint32 bindCount, const VkSparseMemoryBind* pBinds)
+inline VkSparseImageOpaqueMemoryBindInfo makeSparseImageOpaqueMemoryBindInfo (VkImage image, uint32_t bindCount, const VkSparseMemoryBind* pBinds)
 {
        VkSparseImageOpaqueMemoryBindInfo res;
        res.image               = image;
@@ -127,7 +127,7 @@ inline VkSparseImageOpaqueMemoryBindInfo makeSparseImageOpaqueMemoryBindInfo (Vk
        return res;
 }
 
-inline VkImageSubresource makeImageSubresource (VkImageAspectFlags aspectMask, deUint32 mipLevel, deUint32 arrayLayer)
+inline VkImageSubresource makeImageSubresource (VkImageAspectFlags aspectMask, uint32_t mipLevel, uint32_t arrayLayer)
 {
        VkImageSubresource res;
        res.aspectMask  = aspectMask;
@@ -136,7 +136,7 @@ inline VkImageSubresource makeImageSubresource (VkImageAspectFlags aspectMask, d
        return res;
 }
 
-inline VkSparseImageMemoryBindInfo makeSparseImageMemoryBindInfo (VkImage image, deUint32 bindCount, const VkSparseImageMemoryBind* pBinds)
+inline VkSparseImageMemoryBindInfo makeSparseImageMemoryBindInfo (VkImage image, uint32_t bindCount, const VkSparseImageMemoryBind* pBinds)
 {
        VkSparseImageMemoryBindInfo res;
        res.image               = image;
@@ -166,7 +166,7 @@ inline VkComponentMapping makeComponentMapping (VkComponentSwizzle r, VkComponen
        return res;
 }
 
-inline VkSpecializationMapEntry makeSpecializationMapEntry (deUint32 constantID, deUint32 offset, deUintptr size)
+inline VkSpecializationMapEntry makeSpecializationMapEntry (uint32_t constantID, uint32_t offset, deUintptr size)
 {
        VkSpecializationMapEntry res;
        res.constantID  = constantID;
@@ -175,7 +175,7 @@ inline VkSpecializationMapEntry makeSpecializationMapEntry (deUint32 constantID,
        return res;
 }
 
-inline VkSpecializationInfo makeSpecializationInfo (deUint32 mapEntryCount, const VkSpecializationMapEntry* pMapEntries, deUintptr dataSize, const void* pData)
+inline VkSpecializationInfo makeSpecializationInfo (uint32_t mapEntryCount, const VkSpecializationMapEntry* pMapEntries, deUintptr dataSize, const void* pData)
 {
        VkSpecializationInfo res;
        res.mapEntryCount       = mapEntryCount;
@@ -185,7 +185,7 @@ inline VkSpecializationInfo makeSpecializationInfo (deUint32 mapEntryCount, cons
        return res;
 }
 
-inline VkVertexInputBindingDescription makeVertexInputBindingDescription (deUint32 binding, deUint32 stride, VkVertexInputRate inputRate)
+inline VkVertexInputBindingDescription makeVertexInputBindingDescription (uint32_t binding, uint32_t stride, VkVertexInputRate inputRate)
 {
        VkVertexInputBindingDescription res;
        res.binding             = binding;
@@ -194,7 +194,7 @@ inline VkVertexInputBindingDescription makeVertexInputBindingDescription (deUint
        return res;
 }
 
-inline VkVertexInputAttributeDescription makeVertexInputAttributeDescription (deUint32 location, deUint32 binding, VkFormat format, deUint32 offset)
+inline VkVertexInputAttributeDescription makeVertexInputAttributeDescription (uint32_t location, uint32_t binding, VkFormat format, uint32_t offset)
 {
        VkVertexInputAttributeDescription res;
        res.location    = location;
@@ -216,7 +216,7 @@ inline VkViewport makeViewport (float x, float y, float width, float height, flo
        return res;
 }
 
-inline VkStencilOpState makeStencilOpState (VkStencilOp failOp, VkStencilOp passOp, VkStencilOp depthFailOp, VkCompareOp compareOp, deUint32 compareMask, deUint32 writeMask, deUint32 reference)
+inline VkStencilOpState makeStencilOpState (VkStencilOp failOp, VkStencilOp passOp, VkStencilOp depthFailOp, VkCompareOp compareOp, uint32_t compareMask, uint32_t writeMask, uint32_t reference)
 {
        VkStencilOpState res;
        res.failOp              = failOp;
@@ -243,7 +243,7 @@ inline VkPipelineColorBlendAttachmentState makePipelineColorBlendAttachmentState
        return res;
 }
 
-inline VkPushConstantRange makePushConstantRange (VkShaderStageFlags stageFlags, deUint32 offset, deUint32 size)
+inline VkPushConstantRange makePushConstantRange (VkShaderStageFlags stageFlags, uint32_t offset, uint32_t size)
 {
        VkPushConstantRange res;
        res.stageFlags  = stageFlags;
@@ -270,7 +270,7 @@ inline VkDescriptorImageInfo makeDescriptorImageInfo (VkSampler sampler, VkImage
        return res;
 }
 
-inline VkDescriptorPoolSize makeDescriptorPoolSize (VkDescriptorType type, deUint32 descriptorCount)
+inline VkDescriptorPoolSize makeDescriptorPoolSize (VkDescriptorType type, uint32_t descriptorCount)
 {
        VkDescriptorPoolSize res;
        res.type                        = type;
@@ -278,7 +278,7 @@ inline VkDescriptorPoolSize makeDescriptorPoolSize (VkDescriptorType type, deUin
        return res;
 }
 
-inline VkDescriptorSetLayoutBinding makeDescriptorSetLayoutBinding (deUint32 binding, VkDescriptorType descriptorType, deUint32 descriptorCount, VkShaderStageFlags stageFlags, const VkSampler* pImmutableSamplers)
+inline VkDescriptorSetLayoutBinding makeDescriptorSetLayoutBinding (uint32_t binding, VkDescriptorType descriptorType, uint32_t descriptorCount, VkShaderStageFlags stageFlags, const VkSampler* pImmutableSamplers)
 {
        VkDescriptorSetLayoutBinding res;
        res.binding                             = binding;
@@ -304,7 +304,7 @@ inline VkAttachmentDescription makeAttachmentDescription (VkAttachmentDescriptio
        return res;
 }
 
-inline VkAttachmentReference makeAttachmentReference (deUint32 attachment, VkImageLayout layout)
+inline VkAttachmentReference makeAttachmentReference (uint32_t attachment, VkImageLayout layout)
 {
        VkAttachmentReference res;
        res.attachment  = attachment;
@@ -312,7 +312,7 @@ inline VkAttachmentReference makeAttachmentReference (deUint32 attachment, VkIma
        return res;
 }
 
-inline VkSubpassDescription makeSubpassDescription (VkSubpassDescriptionFlags flags, VkPipelineBindPoint pipelineBindPoint, deUint32 inputAttachmentCount, const VkAttachmentReference* pInputAttachments, deUint32 colorAttachmentCount, const VkAttachmentReference* pColorAttachments, const VkAttachmentReference* pResolveAttachments, const VkAttachmentReference* pDepthStencilAttachment, deUint32 preserveAttachmentCount, const deUint32* pPreserveAttachments)
+inline VkSubpassDescription makeSubpassDescription (VkSubpassDescriptionFlags flags, VkPipelineBindPoint pipelineBindPoint, uint32_t inputAttachmentCount, const VkAttachmentReference* pInputAttachments, uint32_t colorAttachmentCount, const VkAttachmentReference* pColorAttachments, const VkAttachmentReference* pResolveAttachments, const VkAttachmentReference* pDepthStencilAttachment, uint32_t preserveAttachmentCount, const uint32_t* pPreserveAttachments)
 {
        VkSubpassDescription res;
        res.flags                                       = flags;
@@ -328,7 +328,7 @@ inline VkSubpassDescription makeSubpassDescription (VkSubpassDescriptionFlags fl
        return res;
 }
 
-inline VkSubpassDependency makeSubpassDependency (deUint32 srcSubpass, deUint32 dstSubpass, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, VkAccessFlags srcAccessMask, VkAccessFlags dstAccessMask, VkDependencyFlags dependencyFlags)
+inline VkSubpassDependency makeSubpassDependency (uint32_t srcSubpass, uint32_t dstSubpass, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, VkAccessFlags srcAccessMask, VkAccessFlags dstAccessMask, VkDependencyFlags dependencyFlags)
 {
        VkSubpassDependency res;
        res.srcSubpass          = srcSubpass;
@@ -350,7 +350,7 @@ inline VkBufferCopy makeBufferCopy (VkDeviceSize srcOffset, VkDeviceSize dstOffs
        return res;
 }
 
-inline VkImageSubresourceLayers makeImageSubresourceLayers (VkImageAspectFlags aspectMask, deUint32 mipLevel, deUint32 baseArrayLayer, deUint32 layerCount)
+inline VkImageSubresourceLayers makeImageSubresourceLayers (VkImageAspectFlags aspectMask, uint32_t mipLevel, uint32_t baseArrayLayer, uint32_t layerCount)
 {
        VkImageSubresourceLayers res;
        res.aspectMask          = aspectMask;
@@ -360,7 +360,7 @@ inline VkImageSubresourceLayers makeImageSubresourceLayers (VkImageAspectFlags a
        return res;
 }
 
-inline VkClearDepthStencilValue makeClearDepthStencilValue (float depth, deUint32 stencil)
+inline VkClearDepthStencilValue makeClearDepthStencilValue (float depth, uint32_t stencil)
 {
        VkClearDepthStencilValue res;
        res.depth       = depth;
@@ -368,7 +368,7 @@ inline VkClearDepthStencilValue makeClearDepthStencilValue (float depth, deUint3
        return res;
 }
 
-inline VkInputAttachmentAspectReference makeInputAttachmentAspectReference (deUint32 subpass, deUint32 inputAttachmentIndex, VkImageAspectFlags aspectMask)
+inline VkInputAttachmentAspectReference makeInputAttachmentAspectReference (uint32_t subpass, uint32_t inputAttachmentIndex, VkImageAspectFlags aspectMask)
 {
        VkInputAttachmentAspectReference res;
        res.subpass                                     = subpass;
@@ -377,7 +377,7 @@ inline VkInputAttachmentAspectReference makeInputAttachmentAspectReference (deUi
        return res;
 }
 
-inline VkDescriptorUpdateTemplateEntry makeDescriptorUpdateTemplateEntry (deUint32 dstBinding, deUint32 dstArrayElement, deUint32 descriptorCount, VkDescriptorType descriptorType, deUintptr offset, deUintptr stride)
+inline VkDescriptorUpdateTemplateEntry makeDescriptorUpdateTemplateEntry (uint32_t dstBinding, uint32_t dstArrayElement, uint32_t descriptorCount, VkDescriptorType descriptorType, deUintptr offset, deUintptr stride)
 {
        VkDescriptorUpdateTemplateEntry res;
        res.dstBinding          = dstBinding;
@@ -416,7 +416,7 @@ inline VkSurfaceFormatKHR makeSurfaceFormatKHR (VkFormat format, VkColorSpaceKHR
        return res;
 }
 
-inline VkDisplayPlanePropertiesKHR makeDisplayPlanePropertiesKHR (VkDisplayKHR currentDisplay, deUint32 currentStackIndex)
+inline VkDisplayPlanePropertiesKHR makeDisplayPlanePropertiesKHR (VkDisplayKHR currentDisplay, uint32_t currentStackIndex)
 {
        VkDisplayPlanePropertiesKHR res;
        res.currentDisplay              = currentDisplay;
@@ -424,7 +424,7 @@ inline VkDisplayPlanePropertiesKHR makeDisplayPlanePropertiesKHR (VkDisplayKHR c
        return res;
 }
 
-inline VkPresentRegionKHR makePresentRegionKHR (deUint32 rectangleCount, const VkRectLayerKHR* pRectangles)
+inline VkPresentRegionKHR makePresentRegionKHR (uint32_t rectangleCount, const VkRectLayerKHR* pRectangles)
 {
        VkPresentRegionKHR res;
        res.rectangleCount      = rectangleCount;
@@ -432,7 +432,7 @@ inline VkPresentRegionKHR makePresentRegionKHR (deUint32 rectangleCount, const V
        return res;
 }
 
-inline VkShaderResourceUsageAMD makeShaderResourceUsageAMD (deUint32 numUsedVgprs, deUint32 numUsedSgprs, deUint32 ldsSizePerLocalWorkGroup, deUintptr ldsUsageSizeInBytes, deUintptr scratchMemUsageInBytes)
+inline VkShaderResourceUsageAMD makeShaderResourceUsageAMD (uint32_t numUsedVgprs, uint32_t numUsedSgprs, uint32_t ldsSizePerLocalWorkGroup, deUintptr ldsUsageSizeInBytes, deUintptr scratchMemUsageInBytes)
 {
        VkShaderResourceUsageAMD res;
        res.numUsedVgprs                                = numUsedVgprs;
@@ -458,7 +458,7 @@ inline VkRefreshCycleDurationGOOGLE makeRefreshCycleDurationGOOGLE (deUint64 ref
        return res;
 }
 
-inline VkPastPresentationTimingGOOGLE makePastPresentationTimingGOOGLE (deUint32 presentID, deUint64 desiredPresentTime, deUint64 actualPresentTime, deUint64 earliestPresentTime, deUint64 presentMargin)
+inline VkPastPresentationTimingGOOGLE makePastPresentationTimingGOOGLE (uint32_t presentID, deUint64 desiredPresentTime, deUint64 actualPresentTime, deUint64 earliestPresentTime, deUint64 presentMargin)
 {
        VkPastPresentationTimingGOOGLE res;
        res.presentID                   = presentID;
@@ -469,7 +469,7 @@ inline VkPastPresentationTimingGOOGLE makePastPresentationTimingGOOGLE (deUint32
        return res;
 }
 
-inline VkPresentTimeGOOGLE makePresentTimeGOOGLE (deUint32 presentID, deUint64 desiredPresentTime)
+inline VkPresentTimeGOOGLE makePresentTimeGOOGLE (uint32_t presentID, deUint64 desiredPresentTime)
 {
        VkPresentTimeGOOGLE res;
        res.presentID                   = presentID;
@@ -503,7 +503,7 @@ inline VkSampleLocationEXT makeSampleLocationEXT (float x, float y)
        return res;
 }
 
-inline VkDrmFormatModifierPropertiesEXT makeDrmFormatModifierPropertiesEXT (deUint64 drmFormatModifier, deUint32 drmFormatModifierPlaneCount, VkFormatFeatureFlags drmFormatModifierTilingFeatures)
+inline VkDrmFormatModifierPropertiesEXT makeDrmFormatModifierPropertiesEXT (deUint64 drmFormatModifier, uint32_t drmFormatModifierPlaneCount, VkFormatFeatureFlags drmFormatModifierTilingFeatures)
 {
        VkDrmFormatModifierPropertiesEXT res;
        res.drmFormatModifier                           = drmFormatModifier;
@@ -512,7 +512,7 @@ inline VkDrmFormatModifierPropertiesEXT makeDrmFormatModifierPropertiesEXT (deUi
        return res;
 }
 
-inline VkShadingRatePaletteNV makeShadingRatePaletteNV (deUint32 shadingRatePaletteEntryCount, const VkShadingRatePaletteEntryNV* pShadingRatePaletteEntries)
+inline VkShadingRatePaletteNV makeShadingRatePaletteNV (uint32_t shadingRatePaletteEntryCount, const VkShadingRatePaletteEntryNV* pShadingRatePaletteEntries)
 {
        VkShadingRatePaletteNV res;
        res.shadingRatePaletteEntryCount        = shadingRatePaletteEntryCount;
@@ -520,7 +520,7 @@ inline VkShadingRatePaletteNV makeShadingRatePaletteNV (deUint32 shadingRatePale
        return res;
 }
 
-inline VkCoarseSampleLocationNV makeCoarseSampleLocationNV (deUint32 pixelX, deUint32 pixelY, deUint32 sample)
+inline VkCoarseSampleLocationNV makeCoarseSampleLocationNV (uint32_t pixelX, uint32_t pixelY, uint32_t sample)
 {
        VkCoarseSampleLocationNV res;
        res.pixelX      = pixelX;
@@ -529,7 +529,7 @@ inline VkCoarseSampleLocationNV makeCoarseSampleLocationNV (deUint32 pixelX, deU
        return res;
 }
 
-inline VkCoarseSampleOrderCustomNV makeCoarseSampleOrderCustomNV (VkShadingRatePaletteEntryNV shadingRate, deUint32 sampleCount, deUint32 sampleLocationCount, const VkCoarseSampleLocationNV* pSampleLocations)
+inline VkCoarseSampleOrderCustomNV makeCoarseSampleOrderCustomNV (VkShadingRatePaletteEntryNV shadingRate, uint32_t sampleCount, uint32_t sampleLocationCount, const VkCoarseSampleLocationNV* pSampleLocations)
 {
        VkCoarseSampleOrderCustomNV res;
        res.shadingRate                 = shadingRate;
@@ -551,7 +551,7 @@ inline VkAabbPositionsKHR makeAabbPositionsKHR (float minX, float minY, float mi
        return res;
 }
 
-inline VkVertexInputBindingDivisorDescriptionEXT makeVertexInputBindingDivisorDescriptionEXT (deUint32 binding, deUint32 divisor)
+inline VkVertexInputBindingDivisorDescriptionEXT makeVertexInputBindingDivisorDescriptionEXT (uint32_t binding, uint32_t divisor)
 {
        VkVertexInputBindingDivisorDescriptionEXT res;
        res.binding     = binding;
@@ -567,7 +567,7 @@ inline VkPipelineCreationFeedbackEXT makePipelineCreationFeedbackEXT (VkPipeline
        return res;
 }
 
-inline VkDrawMeshTasksIndirectCommandNV makeDrawMeshTasksIndirectCommandNV (deUint32 taskCount, deUint32 firstTask)
+inline VkDrawMeshTasksIndirectCommandNV makeDrawMeshTasksIndirectCommandNV (uint32_t taskCount, uint32_t firstTask)
 {
        VkDrawMeshTasksIndirectCommandNV res;
        res.taskCount   = taskCount;
@@ -575,14 +575,14 @@ inline VkDrawMeshTasksIndirectCommandNV makeDrawMeshTasksIndirectCommandNV (deUi
        return res;
 }
 
-inline VkBindShaderGroupIndirectCommandNV makeBindShaderGroupIndirectCommandNV (deUint32 groupIndex)
+inline VkBindShaderGroupIndirectCommandNV makeBindShaderGroupIndirectCommandNV (uint32_t groupIndex)
 {
        VkBindShaderGroupIndirectCommandNV res;
        res.groupIndex  = groupIndex;
        return res;
 }
 
-inline VkBindIndexBufferIndirectCommandNV makeBindIndexBufferIndirectCommandNV (VkDeviceAddress bufferAddress, deUint32 size, VkIndexType indexType)
+inline VkBindIndexBufferIndirectCommandNV makeBindIndexBufferIndirectCommandNV (VkDeviceAddress bufferAddress, uint32_t size, VkIndexType indexType)
 {
        VkBindIndexBufferIndirectCommandNV res;
        res.bufferAddress       = bufferAddress;
@@ -591,7 +591,7 @@ inline VkBindIndexBufferIndirectCommandNV makeBindIndexBufferIndirectCommandNV (
        return res;
 }
 
-inline VkBindVertexBufferIndirectCommandNV makeBindVertexBufferIndirectCommandNV (VkDeviceAddress bufferAddress, deUint32 size, deUint32 stride)
+inline VkBindVertexBufferIndirectCommandNV makeBindVertexBufferIndirectCommandNV (VkDeviceAddress bufferAddress, uint32_t size, uint32_t stride)
 {
        VkBindVertexBufferIndirectCommandNV res;
        res.bufferAddress       = bufferAddress;
@@ -600,7 +600,7 @@ inline VkBindVertexBufferIndirectCommandNV makeBindVertexBufferIndirectCommandNV
        return res;
 }
 
-inline VkSetStateFlagsIndirectCommandNV makeSetStateFlagsIndirectCommandNV (deUint32 data)
+inline VkSetStateFlagsIndirectCommandNV makeSetStateFlagsIndirectCommandNV (uint32_t data)
 {
        VkSetStateFlagsIndirectCommandNV res;
        res.data        = data;
@@ -637,7 +637,7 @@ inline VkSRTDataNV makeSRTDataNV (float sx, float a, float b, float pvx, float s
        return res;
 }
 
-inline VkMutableDescriptorTypeListVALVE makeMutableDescriptorTypeListVALVE (deUint32 descriptorTypeCount, const VkDescriptorType* pDescriptorTypes)
+inline VkMutableDescriptorTypeListVALVE makeMutableDescriptorTypeListVALVE (uint32_t descriptorTypeCount, const VkDescriptorType* pDescriptorTypes)
 {
        VkMutableDescriptorTypeListVALVE res;
        res.descriptorTypeCount = descriptorTypeCount;
@@ -645,7 +645,7 @@ inline VkMutableDescriptorTypeListVALVE makeMutableDescriptorTypeListVALVE (deUi
        return res;
 }
 
-inline VkMultiDrawInfoEXT makeMultiDrawInfoEXT (deUint32 firstVertex, deUint32 vertexCount)
+inline VkMultiDrawInfoEXT makeMultiDrawInfoEXT (uint32_t firstVertex, uint32_t vertexCount)
 {
        VkMultiDrawInfoEXT res;
        res.firstVertex = firstVertex;
@@ -653,7 +653,7 @@ inline VkMultiDrawInfoEXT makeMultiDrawInfoEXT (deUint32 firstVertex, deUint32 v
        return res;
 }
 
-inline VkMultiDrawIndexedInfoEXT makeMultiDrawIndexedInfoEXT (deUint32 firstIndex, deUint32 indexCount, deInt32 vertexOffset)
+inline VkMultiDrawIndexedInfoEXT makeMultiDrawIndexedInfoEXT (uint32_t firstIndex, uint32_t indexCount, int32_t vertexOffset)
 {
        VkMultiDrawIndexedInfoEXT res;
        res.firstIndex          = firstIndex;
@@ -662,7 +662,7 @@ inline VkMultiDrawIndexedInfoEXT makeMultiDrawIndexedInfoEXT (deUint32 firstInde
        return res;
 }
 
-inline VkAccelerationStructureBuildRangeInfoKHR makeAccelerationStructureBuildRangeInfoKHR (deUint32 primitiveCount, deUint32 primitiveOffset, deUint32 firstVertex, deUint32 transformOffset)
+inline VkAccelerationStructureBuildRangeInfoKHR makeAccelerationStructureBuildRangeInfoKHR (uint32_t primitiveCount, uint32_t primitiveOffset, uint32_t firstVertex, uint32_t transformOffset)
 {
        VkAccelerationStructureBuildRangeInfoKHR res;
        res.primitiveCount      = primitiveCount;
@@ -681,7 +681,7 @@ inline VkStridedDeviceAddressRegionKHR makeStridedDeviceAddressRegionKHR (VkDevi
        return res;
 }
 
-inline VkTraceRaysIndirectCommandKHR makeTraceRaysIndirectCommandKHR (deUint32 width, deUint32 height, deUint32 depth)
+inline VkTraceRaysIndirectCommandKHR makeTraceRaysIndirectCommandKHR (uint32_t width, uint32_t height, uint32_t depth)
 {
        VkTraceRaysIndirectCommandKHR res;
        res.width       = width;
@@ -710,7 +710,7 @@ inline StdVideoEncodeH264RefPicMarkingEntry makeStdVideoEncodeH264RefPicMarkingE
        return res;
 }
 
-inline StdVideoDecodeH264Mvc makeStdVideoDecodeH264Mvc (deUint32 viewId0, deUint32 mvcElementCount, StdVideoDecodeH264MvcElement* pMvcElements)
+inline StdVideoDecodeH264Mvc makeStdVideoDecodeH264Mvc (uint32_t viewId0, uint32_t mvcElementCount, StdVideoDecodeH264MvcElement* pMvcElements)
 {
        StdVideoDecodeH264Mvc res;
        res.viewId0                     = viewId0;
index d25c5d9..1f24811 100644 (file)
@@ -3,28 +3,28 @@
  */
 virtual PFN_vkVoidFunction     getDeviceProcAddr                                                               (VkDevice device, const char* pName) const = 0;
 virtual void                           destroyDevice                                                                   (VkDevice device, const VkAllocationCallbacks* pAllocator) const = 0;
-virtual void                           getDeviceQueue                                                                  (VkDevice device, deUint32 queueFamilyIndex, deUint32 queueIndex, VkQueue* pQueue) const = 0;
-virtual VkResult                       queueSubmit                                                                             (VkQueue queue, deUint32 submitCount, const VkSubmitInfo* pSubmits, VkFence fence) const = 0;
+virtual void                           getDeviceQueue                                                                  (VkDevice device, uint32_t queueFamilyIndex, uint32_t queueIndex, VkQueue* pQueue) const = 0;
+virtual VkResult                       queueSubmit                                                                             (VkQueue queue, uint32_t submitCount, const VkSubmitInfo* pSubmits, VkFence fence) const = 0;
 virtual VkResult                       queueWaitIdle                                                                   (VkQueue queue) const = 0;
 virtual VkResult                       deviceWaitIdle                                                                  (VkDevice device) const = 0;
 virtual VkResult                       allocateMemory                                                                  (VkDevice device, const VkMemoryAllocateInfo* pAllocateInfo, const VkAllocationCallbacks* pAllocator, VkDeviceMemory* pMemory) const = 0;
 virtual void                           freeMemory                                                                              (VkDevice device, VkDeviceMemory memory, const VkAllocationCallbacks* pAllocator) const = 0;
 virtual VkResult                       mapMemory                                                                               (VkDevice device, VkDeviceMemory memory, VkDeviceSize offset, VkDeviceSize size, VkMemoryMapFlags flags, void** ppData) const = 0;
 virtual void                           unmapMemory                                                                             (VkDevice device, VkDeviceMemory memory) const = 0;
-virtual VkResult                       flushMappedMemoryRanges                                                 (VkDevice device, deUint32 memoryRangeCount, const VkMappedMemoryRange* pMemoryRanges) const = 0;
-virtual VkResult                       invalidateMappedMemoryRanges                                    (VkDevice device, deUint32 memoryRangeCount, const VkMappedMemoryRange* pMemoryRanges) const = 0;
+virtual VkResult                       flushMappedMemoryRanges                                                 (VkDevice device, uint32_t memoryRangeCount, const VkMappedMemoryRange* pMemoryRanges) const = 0;
+virtual VkResult                       invalidateMappedMemoryRanges                                    (VkDevice device, uint32_t memoryRangeCount, const VkMappedMemoryRange* pMemoryRanges) const = 0;
 virtual void                           getDeviceMemoryCommitment                                               (VkDevice device, VkDeviceMemory memory, VkDeviceSize* pCommittedMemoryInBytes) const = 0;
 virtual VkResult                       bindBufferMemory                                                                (VkDevice device, VkBuffer buffer, VkDeviceMemory memory, VkDeviceSize memoryOffset) const = 0;
 virtual VkResult                       bindImageMemory                                                                 (VkDevice device, VkImage image, VkDeviceMemory memory, VkDeviceSize memoryOffset) const = 0;
 virtual void                           getBufferMemoryRequirements                                             (VkDevice device, VkBuffer buffer, VkMemoryRequirements* pMemoryRequirements) const = 0;
 virtual void                           getImageMemoryRequirements                                              (VkDevice device, VkImage image, VkMemoryRequirements* pMemoryRequirements) const = 0;
-virtual void                           getImageSparseMemoryRequirements                                (VkDevice device, VkImage image, deUint32* pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements* pSparseMemoryRequirements) const = 0;
-virtual VkResult                       queueBindSparse                                                                 (VkQueue queue, deUint32 bindInfoCount, const VkBindSparseInfo* pBindInfo, VkFence fence) const = 0;
+virtual void                           getImageSparseMemoryRequirements                                (VkDevice device, VkImage image, uint32_t* pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements* pSparseMemoryRequirements) const = 0;
+virtual VkResult                       queueBindSparse                                                                 (VkQueue queue, uint32_t bindInfoCount, const VkBindSparseInfo* pBindInfo, VkFence fence) const = 0;
 virtual VkResult                       createFence                                                                             (VkDevice device, const VkFenceCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkFence* pFence) const = 0;
 virtual void                           destroyFence                                                                    (VkDevice device, VkFence fence, const VkAllocationCallbacks* pAllocator) const = 0;
-virtual VkResult                       resetFences                                                                             (VkDevice device, deUint32 fenceCount, const VkFence* pFences) const = 0;
+virtual VkResult                       resetFences                                                                             (VkDevice device, uint32_t fenceCount, const VkFence* pFences) const = 0;
 virtual VkResult                       getFenceStatus                                                                  (VkDevice device, VkFence fence) const = 0;
-virtual VkResult                       waitForFences                                                                   (VkDevice device, deUint32 fenceCount, const VkFence* pFences, VkBool32 waitAll, deUint64 timeout) const = 0;
+virtual VkResult                       waitForFences                                                                   (VkDevice device, uint32_t fenceCount, const VkFence* pFences, VkBool32 waitAll, deUint64 timeout) const = 0;
 virtual VkResult                       createSemaphore                                                                 (VkDevice device, const VkSemaphoreCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSemaphore* pSemaphore) const = 0;
 virtual void                           destroySemaphore                                                                (VkDevice device, VkSemaphore semaphore, const VkAllocationCallbacks* pAllocator) const = 0;
 virtual VkResult                       createEvent                                                                             (VkDevice device, const VkEventCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkEvent* pEvent) const = 0;
@@ -34,7 +34,7 @@ virtual VkResult                      setEvent                                                                                (VkDevice device, VkEvent event) const = 0;
 virtual VkResult                       resetEvent                                                                              (VkDevice device, VkEvent event) const = 0;
 virtual VkResult                       createQueryPool                                                                 (VkDevice device, const VkQueryPoolCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkQueryPool* pQueryPool) const = 0;
 virtual void                           destroyQueryPool                                                                (VkDevice device, VkQueryPool queryPool, const VkAllocationCallbacks* pAllocator) const = 0;
-virtual VkResult                       getQueryPoolResults                                                             (VkDevice device, VkQueryPool queryPool, deUint32 firstQuery, deUint32 queryCount, deUintptr dataSize, void* pData, VkDeviceSize stride, VkQueryResultFlags flags) const = 0;
+virtual VkResult                       getQueryPoolResults                                                             (VkDevice device, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount, deUintptr dataSize, void* pData, VkDeviceSize stride, VkQueryResultFlags flags) const = 0;
 virtual VkResult                       createBuffer                                                                    (VkDevice device, const VkBufferCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkBuffer* pBuffer) const = 0;
 virtual void                           destroyBuffer                                                                   (VkDevice device, VkBuffer buffer, const VkAllocationCallbacks* pAllocator) const = 0;
 virtual VkResult                       createBufferView                                                                (VkDevice device, const VkBufferViewCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkBufferView* pView) const = 0;
@@ -49,9 +49,9 @@ virtual void                          destroyShaderModule                                                             (VkDevice device, VkShaderModule shad
 virtual VkResult                       createPipelineCache                                                             (VkDevice device, const VkPipelineCacheCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkPipelineCache* pPipelineCache) const = 0;
 virtual void                           destroyPipelineCache                                                    (VkDevice device, VkPipelineCache pipelineCache, const VkAllocationCallbacks* pAllocator) const = 0;
 virtual VkResult                       getPipelineCacheData                                                    (VkDevice device, VkPipelineCache pipelineCache, deUintptr* pDataSize, void* pData) const = 0;
-virtual VkResult                       mergePipelineCaches                                                             (VkDevice device, VkPipelineCache dstCache, deUint32 srcCacheCount, const VkPipelineCache* pSrcCaches) const = 0;
-virtual VkResult                       createGraphicsPipelines                                                 (VkDevice device, VkPipelineCache pipelineCache, deUint32 createInfoCount, const VkGraphicsPipelineCreateInfo* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkPipeline* pPipelines) const = 0;
-virtual VkResult                       createComputePipelines                                                  (VkDevice device, VkPipelineCache pipelineCache, deUint32 createInfoCount, const VkComputePipelineCreateInfo* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkPipeline* pPipelines) const = 0;
+virtual VkResult                       mergePipelineCaches                                                             (VkDevice device, VkPipelineCache dstCache, uint32_t srcCacheCount, const VkPipelineCache* pSrcCaches) const = 0;
+virtual VkResult                       createGraphicsPipelines                                                 (VkDevice device, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkGraphicsPipelineCreateInfo* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkPipeline* pPipelines) const = 0;
+virtual VkResult                       createComputePipelines                                                  (VkDevice device, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkComputePipelineCreateInfo* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkPipeline* pPipelines) const = 0;
 virtual void                           destroyPipeline                                                                 (VkDevice device, VkPipeline pipeline, const VkAllocationCallbacks* pAllocator) const = 0;
 virtual VkResult                       createPipelineLayout                                                    (VkDevice device, const VkPipelineLayoutCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkPipelineLayout* pPipelineLayout) const = 0;
 virtual void                           destroyPipelineLayout                                                   (VkDevice device, VkPipelineLayout pipelineLayout, const VkAllocationCallbacks* pAllocator) const = 0;
@@ -63,8 +63,8 @@ virtual VkResult                      createDescriptorPool                                                    (VkDevice device, const VkDescript
 virtual void                           destroyDescriptorPool                                                   (VkDevice device, VkDescriptorPool descriptorPool, const VkAllocationCallbacks* pAllocator) const = 0;
 virtual VkResult                       resetDescriptorPool                                                             (VkDevice device, VkDescriptorPool descriptorPool, VkDescriptorPoolResetFlags flags) const = 0;
 virtual VkResult                       allocateDescriptorSets                                                  (VkDevice device, const VkDescriptorSetAllocateInfo* pAllocateInfo, VkDescriptorSet* pDescriptorSets) const = 0;
-virtual VkResult                       freeDescriptorSets                                                              (VkDevice device, VkDescriptorPool descriptorPool, deUint32 descriptorSetCount, const VkDescriptorSet* pDescriptorSets) const = 0;
-virtual void                           updateDescriptorSets                                                    (VkDevice device, deUint32 descriptorWriteCount, const VkWriteDescriptorSet* pDescriptorWrites, deUint32 descriptorCopyCount, const VkCopyDescriptorSet* pDescriptorCopies) const = 0;
+virtual VkResult                       freeDescriptorSets                                                              (VkDevice device, VkDescriptorPool descriptorPool, uint32_t descriptorSetCount, const VkDescriptorSet* pDescriptorSets) const = 0;
+virtual void                           updateDescriptorSets                                                    (VkDevice device, uint32_t descriptorWriteCount, const VkWriteDescriptorSet* pDescriptorWrites, uint32_t descriptorCopyCount, const VkCopyDescriptorSet* pDescriptorCopies) const = 0;
 virtual VkResult                       createFramebuffer                                                               (VkDevice device, const VkFramebufferCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkFramebuffer* pFramebuffer) const = 0;
 virtual void                           destroyFramebuffer                                                              (VkDevice device, VkFramebuffer framebuffer, const VkAllocationCallbacks* pAllocator) const = 0;
 virtual VkResult                       createRenderPass                                                                (VkDevice device, const VkRenderPassCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkRenderPass* pRenderPass) const = 0;
@@ -74,62 +74,62 @@ virtual VkResult                    createCommandPool                                                               (VkDevice device, const VkCommandPoo
 virtual void                           destroyCommandPool                                                              (VkDevice device, VkCommandPool commandPool, const VkAllocationCallbacks* pAllocator) const = 0;
 virtual VkResult                       resetCommandPool                                                                (VkDevice device, VkCommandPool commandPool, VkCommandPoolResetFlags flags) const = 0;
 virtual VkResult                       allocateCommandBuffers                                                  (VkDevice device, const VkCommandBufferAllocateInfo* pAllocateInfo, VkCommandBuffer* pCommandBuffers) const = 0;
-virtual void                           freeCommandBuffers                                                              (VkDevice device, VkCommandPool commandPool, deUint32 commandBufferCount, const VkCommandBuffer* pCommandBuffers) const = 0;
+virtual void                           freeCommandBuffers                                                              (VkDevice device, VkCommandPool commandPool, uint32_t commandBufferCount, const VkCommandBuffer* pCommandBuffers) const = 0;
 virtual VkResult                       beginCommandBuffer                                                              (VkCommandBuffer commandBuffer, const VkCommandBufferBeginInfo* pBeginInfo) const = 0;
 virtual VkResult                       endCommandBuffer                                                                (VkCommandBuffer commandBuffer) const = 0;
 virtual VkResult                       resetCommandBuffer                                                              (VkCommandBuffer commandBuffer, VkCommandBufferResetFlags flags) const = 0;
 virtual void                           cmdBindPipeline                                                                 (VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline pipeline) const = 0;
-virtual void                           cmdSetViewport                                                                  (VkCommandBuffer commandBuffer, deUint32 firstViewport, deUint32 viewportCount, const VkViewport* pViewports) const = 0;
-virtual void                           cmdSetScissor                                                                   (VkCommandBuffer commandBuffer, deUint32 firstScissor, deUint32 scissorCount, const VkRect2D* pScissors) const = 0;
+virtual void                           cmdSetViewport                                                                  (VkCommandBuffer commandBuffer, uint32_t firstViewport, uint32_t viewportCount, const VkViewport* pViewports) const = 0;
+virtual void                           cmdSetScissor                                                                   (VkCommandBuffer commandBuffer, uint32_t firstScissor, uint32_t scissorCount, const VkRect2D* pScissors) const = 0;
 virtual void                           cmdSetLineWidth                                                                 (VkCommandBuffer commandBuffer, float lineWidth) const = 0;
 virtual void                           cmdSetDepthBias                                                                 (VkCommandBuffer commandBuffer, float depthBiasConstantFactor, float depthBiasClamp, float depthBiasSlopeFactor) const = 0;
 virtual void                           cmdSetBlendConstants                                                    (VkCommandBuffer commandBuffer, const float blendConstants[4]) const = 0;
 virtual void                           cmdSetDepthBounds                                                               (VkCommandBuffer commandBuffer, float minDepthBounds, float maxDepthBounds) const = 0;
-virtual void                           cmdSetStencilCompareMask                                                (VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, deUint32 compareMask) const = 0;
-virtual void                           cmdSetStencilWriteMask                                                  (VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, deUint32 writeMask) const = 0;
-virtual void                           cmdSetStencilReference                                                  (VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, deUint32 reference) const = 0;
-virtual void                           cmdBindDescriptorSets                                                   (VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, deUint32 firstSet, deUint32 descriptorSetCount, const VkDescriptorSet* pDescriptorSets, deUint32 dynamicOffsetCount, const deUint32* pDynamicOffsets) const = 0;
+virtual void                           cmdSetStencilCompareMask                                                (VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t compareMask) const = 0;
+virtual void                           cmdSetStencilWriteMask                                                  (VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t writeMask) const = 0;
+virtual void                           cmdSetStencilReference                                                  (VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t reference) const = 0;
+virtual void                           cmdBindDescriptorSets                                                   (VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, uint32_t firstSet, uint32_t descriptorSetCount, const VkDescriptorSet* pDescriptorSets, uint32_t dynamicOffsetCount, const uint32_t* pDynamicOffsets) const = 0;
 virtual void                           cmdBindIndexBuffer                                                              (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkIndexType indexType) const = 0;
-virtual void                           cmdBindVertexBuffers                                                    (VkCommandBuffer commandBuffer, deUint32 firstBinding, deUint32 bindingCount, const VkBuffer* pBuffers, const VkDeviceSize* pOffsets) const = 0;
-virtual void                           cmdDraw                                                                                 (VkCommandBuffer commandBuffer, deUint32 vertexCount, deUint32 instanceCount, deUint32 firstVertex, deUint32 firstInstance) const = 0;
-virtual void                           cmdDrawIndexed                                                                  (VkCommandBuffer commandBuffer, deUint32 indexCount, deUint32 instanceCount, deUint32 firstIndex, deInt32 vertexOffset, deUint32 firstInstance) const = 0;
-virtual void                           cmdDrawIndirect                                                                 (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, deUint32 drawCount, deUint32 stride) const = 0;
-virtual void                           cmdDrawIndexedIndirect                                                  (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, deUint32 drawCount, deUint32 stride) const = 0;
-virtual void                           cmdDispatch                                                                             (VkCommandBuffer commandBuffer, deUint32 groupCountX, deUint32 groupCountY, deUint32 groupCountZ) const = 0;
+virtual void                           cmdBindVertexBuffers                                                    (VkCommandBuffer commandBuffer, uint32_t firstBinding, uint32_t bindingCount, const VkBuffer* pBuffers, const VkDeviceSize* pOffsets) const = 0;
+virtual void                           cmdDraw                                                                                 (VkCommandBuffer commandBuffer, uint32_t vertexCount, uint32_t instanceCount, uint32_t firstVertex, uint32_t firstInstance) const = 0;
+virtual void                           cmdDrawIndexed                                                                  (VkCommandBuffer commandBuffer, uint32_t indexCount, uint32_t instanceCount, uint32_t firstIndex, int32_t vertexOffset, uint32_t firstInstance) const = 0;
+virtual void                           cmdDrawIndirect                                                                 (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride) const = 0;
+virtual void                           cmdDrawIndexedIndirect                                                  (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride) const = 0;
+virtual void                           cmdDispatch                                                                             (VkCommandBuffer commandBuffer, uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ) const = 0;
 virtual void                           cmdDispatchIndirect                                                             (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset) const = 0;
-virtual void                           cmdCopyBuffer                                                                   (VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkBuffer dstBuffer, deUint32 regionCount, const VkBufferCopy* pRegions) const = 0;
-virtual void                           cmdCopyImage                                                                    (VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, deUint32 regionCount, const VkImageCopy* pRegions) const = 0;
-virtual void                           cmdBlitImage                                                                    (VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, deUint32 regionCount, const VkImageBlit* pRegions, VkFilter filter) const = 0;
-virtual void                           cmdCopyBufferToImage                                                    (VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkImage dstImage, VkImageLayout dstImageLayout, deUint32 regionCount, const VkBufferImageCopy* pRegions) const = 0;
-virtual void                           cmdCopyImageToBuffer                                                    (VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkBuffer dstBuffer, deUint32 regionCount, const VkBufferImageCopy* pRegions) const = 0;
+virtual void                           cmdCopyBuffer                                                                   (VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkBuffer dstBuffer, uint32_t regionCount, const VkBufferCopy* pRegions) const = 0;
+virtual void                           cmdCopyImage                                                                    (VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageCopy* pRegions) const = 0;
+virtual void                           cmdBlitImage                                                                    (VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageBlit* pRegions, VkFilter filter) const = 0;
+virtual void                           cmdCopyBufferToImage                                                    (VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkBufferImageCopy* pRegions) const = 0;
+virtual void                           cmdCopyImageToBuffer                                                    (VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkBuffer dstBuffer, uint32_t regionCount, const VkBufferImageCopy* pRegions) const = 0;
 virtual void                           cmdUpdateBuffer                                                                 (VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize dataSize, const void* pData) const = 0;
-virtual void                           cmdFillBuffer                                                                   (VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize size, deUint32 data) const = 0;
-virtual void                           cmdClearColorImage                                                              (VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearColorValue* pColor, deUint32 rangeCount, const VkImageSubresourceRange* pRanges) const = 0;
-virtual void                           cmdClearDepthStencilImage                                               (VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearDepthStencilValue* pDepthStencil, deUint32 rangeCount, const VkImageSubresourceRange* pRanges) const = 0;
-virtual void                           cmdClearAttachments                                                             (VkCommandBuffer commandBuffer, deUint32 attachmentCount, const VkClearAttachment* pAttachments, deUint32 rectCount, const VkClearRect* pRects) const = 0;
-virtual void                           cmdResolveImage                                                                 (VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, deUint32 regionCount, const VkImageResolve* pRegions) const = 0;
+virtual void                           cmdFillBuffer                                                                   (VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize size, uint32_t data) const = 0;
+virtual void                           cmdClearColorImage                                                              (VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearColorValue* pColor, uint32_t rangeCount, const VkImageSubresourceRange* pRanges) const = 0;
+virtual void                           cmdClearDepthStencilImage                                               (VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearDepthStencilValue* pDepthStencil, uint32_t rangeCount, const VkImageSubresourceRange* pRanges) const = 0;
+virtual void                           cmdClearAttachments                                                             (VkCommandBuffer commandBuffer, uint32_t attachmentCount, const VkClearAttachment* pAttachments, uint32_t rectCount, const VkClearRect* pRects) const = 0;
+virtual void                           cmdResolveImage                                                                 (VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageResolve* pRegions) const = 0;
 virtual void                           cmdSetEvent                                                                             (VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags stageMask) const = 0;
 virtual void                           cmdResetEvent                                                                   (VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags stageMask) const = 0;
-virtual void                           cmdWaitEvents                                                                   (VkCommandBuffer commandBuffer, deUint32 eventCount, const VkEvent* pEvents, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, deUint32 memoryBarrierCount, const VkMemoryBarrier* pMemoryBarriers, deUint32 bufferMemoryBarrierCount, const VkBufferMemoryBarrier* pBufferMemoryBarriers, deUint32 imageMemoryBarrierCount, const VkImageMemoryBarrier* pImageMemoryBarriers) const = 0;
-virtual void                           cmdPipelineBarrier                                                              (VkCommandBuffer commandBuffer, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, VkDependencyFlags dependencyFlags, deUint32 memoryBarrierCount, const VkMemoryBarrier* pMemoryBarriers, deUint32 bufferMemoryBarrierCount, const VkBufferMemoryBarrier* pBufferMemoryBarriers, deUint32 imageMemoryBarrierCount, const VkImageMemoryBarrier* pImageMemoryBarriers) const = 0;
-virtual void                           cmdBeginQuery                                                                   (VkCommandBuffer commandBuffer, VkQueryPool queryPool, deUint32 query, VkQueryControlFlags flags) const = 0;
-virtual void                           cmdEndQuery                                                                             (VkCommandBuffer commandBuffer, VkQueryPool queryPool, deUint32 query) const = 0;
-virtual void                           cmdResetQueryPool                                                               (VkCommandBuffer commandBuffer, VkQueryPool queryPool, deUint32 firstQuery, deUint32 queryCount) const = 0;
-virtual void                           cmdWriteTimestamp                                                               (VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkQueryPool queryPool, deUint32 query) const = 0;
-virtual void                           cmdCopyQueryPoolResults                                                 (VkCommandBuffer commandBuffer, VkQueryPool queryPool, deUint32 firstQuery, deUint32 queryCount, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize stride, VkQueryResultFlags flags) const = 0;
-virtual void                           cmdPushConstants                                                                (VkCommandBuffer commandBuffer, VkPipelineLayout layout, VkShaderStageFlags stageFlags, deUint32 offset, deUint32 size, const void* pValues) const = 0;
+virtual void                           cmdWaitEvents                                                                   (VkCommandBuffer commandBuffer, uint32_t eventCount, const VkEvent* pEvents, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, uint32_t memoryBarrierCount, const VkMemoryBarrier* pMemoryBarriers, uint32_t bufferMemoryBarrierCount, const VkBufferMemoryBarrier* pBufferMemoryBarriers, uint32_t imageMemoryBarrierCount, const VkImageMemoryBarrier* pImageMemoryBarriers) const = 0;
+virtual void                           cmdPipelineBarrier                                                              (VkCommandBuffer commandBuffer, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, VkDependencyFlags dependencyFlags, uint32_t memoryBarrierCount, const VkMemoryBarrier* pMemoryBarriers, uint32_t bufferMemoryBarrierCount, const VkBufferMemoryBarrier* pBufferMemoryBarriers, uint32_t imageMemoryBarrierCount, const VkImageMemoryBarrier* pImageMemoryBarriers) const = 0;
+virtual void                           cmdBeginQuery                                                                   (VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query, VkQueryControlFlags flags) const = 0;
+virtual void                           cmdEndQuery                                                                             (VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query) const = 0;
+virtual void                           cmdResetQueryPool                                                               (VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount) const = 0;
+virtual void                           cmdWriteTimestamp                                                               (VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkQueryPool queryPool, uint32_t query) const = 0;
+virtual void                           cmdCopyQueryPoolResults                                                 (VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize stride, VkQueryResultFlags flags) const = 0;
+virtual void                           cmdPushConstants                                                                (VkCommandBuffer commandBuffer, VkPipelineLayout layout, VkShaderStageFlags stageFlags, uint32_t offset, uint32_t size, const void* pValues) const = 0;
 virtual void                           cmdBeginRenderPass                                                              (VkCommandBuffer commandBuffer, const VkRenderPassBeginInfo* pRenderPassBegin, VkSubpassContents contents) const = 0;
 virtual void                           cmdNextSubpass                                                                  (VkCommandBuffer commandBuffer, VkSubpassContents contents) const = 0;
 virtual void                           cmdEndRenderPass                                                                (VkCommandBuffer commandBuffer) const = 0;
-virtual void                           cmdExecuteCommands                                                              (VkCommandBuffer commandBuffer, deUint32 commandBufferCount, const VkCommandBuffer* pCommandBuffers) const = 0;
-virtual VkResult                       bindBufferMemory2                                                               (VkDevice device, deUint32 bindInfoCount, const VkBindBufferMemoryInfo* pBindInfos) const = 0;
-virtual VkResult                       bindImageMemory2                                                                (VkDevice device, deUint32 bindInfoCount, const VkBindImageMemoryInfo* pBindInfos) const = 0;
-virtual void                           getDeviceGroupPeerMemoryFeatures                                (VkDevice device, deUint32 heapIndex, deUint32 localDeviceIndex, deUint32 remoteDeviceIndex, VkPeerMemoryFeatureFlags* pPeerMemoryFeatures) const = 0;
-virtual void                           cmdSetDeviceMask                                                                (VkCommandBuffer commandBuffer, deUint32 deviceMask) const = 0;
-virtual void                           cmdDispatchBase                                                                 (VkCommandBuffer commandBuffer, deUint32 baseGroupX, deUint32 baseGroupY, deUint32 baseGroupZ, deUint32 groupCountX, deUint32 groupCountY, deUint32 groupCountZ) const = 0;
+virtual void                           cmdExecuteCommands                                                              (VkCommandBuffer commandBuffer, uint32_t commandBufferCount, const VkCommandBuffer* pCommandBuffers) const = 0;
+virtual VkResult                       bindBufferMemory2                                                               (VkDevice device, uint32_t bindInfoCount, const VkBindBufferMemoryInfo* pBindInfos) const = 0;
+virtual VkResult                       bindImageMemory2                                                                (VkDevice device, uint32_t bindInfoCount, const VkBindImageMemoryInfo* pBindInfos) const = 0;
+virtual void                           getDeviceGroupPeerMemoryFeatures                                (VkDevice device, uint32_t heapIndex, uint32_t localDeviceIndex, uint32_t remoteDeviceIndex, VkPeerMemoryFeatureFlags* pPeerMemoryFeatures) const = 0;
+virtual void                           cmdSetDeviceMask                                                                (VkCommandBuffer commandBuffer, uint32_t deviceMask) const = 0;
+virtual void                           cmdDispatchBase                                                                 (VkCommandBuffer commandBuffer, uint32_t baseGroupX, uint32_t baseGroupY, uint32_t baseGroupZ, uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ) const = 0;
 virtual void                           getImageMemoryRequirements2                                             (VkDevice device, const VkImageMemoryRequirementsInfo2* pInfo, VkMemoryRequirements2* pMemoryRequirements) const = 0;
 virtual void                           getBufferMemoryRequirements2                                    (VkDevice device, const VkBufferMemoryRequirementsInfo2* pInfo, VkMemoryRequirements2* pMemoryRequirements) const = 0;
-virtual void                           getImageSparseMemoryRequirements2                               (VkDevice device, const VkImageSparseMemoryRequirementsInfo2* pInfo, deUint32* pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements2* pSparseMemoryRequirements) const = 0;
+virtual void                           getImageSparseMemoryRequirements2                               (VkDevice device, const VkImageSparseMemoryRequirementsInfo2* pInfo, uint32_t* pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements2* pSparseMemoryRequirements) const = 0;
 virtual void                           trimCommandPool                                                                 (VkDevice device, VkCommandPool commandPool, VkCommandPoolTrimFlags flags) const = 0;
 virtual void                           getDeviceQueue2                                                                 (VkDevice device, const VkDeviceQueueInfo2* pQueueInfo, VkQueue* pQueue) const = 0;
 virtual VkResult                       createSamplerYcbcrConversion                                    (VkDevice device, const VkSamplerYcbcrConversionCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSamplerYcbcrConversion* pYcbcrConversion) const = 0;
@@ -138,13 +138,13 @@ virtual VkResult                  createDescriptorUpdateTemplate                                  (VkDevice device, const Vk
 virtual void                           destroyDescriptorUpdateTemplate                                 (VkDevice device, VkDescriptorUpdateTemplate descriptorUpdateTemplate, const VkAllocationCallbacks* pAllocator) const = 0;
 virtual void                           updateDescriptorSetWithTemplate                                 (VkDevice device, VkDescriptorSet descriptorSet, VkDescriptorUpdateTemplate descriptorUpdateTemplate, const void* pData) const = 0;
 virtual void                           getDescriptorSetLayoutSupport                                   (VkDevice device, const VkDescriptorSetLayoutCreateInfo* pCreateInfo, VkDescriptorSetLayoutSupport* pSupport) const = 0;
-virtual void                           cmdDrawIndirectCount                                                    (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, deUint32 maxDrawCount, deUint32 stride) const = 0;
-virtual void                           cmdDrawIndexedIndirectCount                                             (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, deUint32 maxDrawCount, deUint32 stride) const = 0;
+virtual void                           cmdDrawIndirectCount                                                    (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride) const = 0;
+virtual void                           cmdDrawIndexedIndirectCount                                             (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride) const = 0;
 virtual VkResult                       createRenderPass2                                                               (VkDevice device, const VkRenderPassCreateInfo2* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkRenderPass* pRenderPass) const = 0;
 virtual void                           cmdBeginRenderPass2                                                             (VkCommandBuffer commandBuffer, const VkRenderPassBeginInfo* pRenderPassBegin, const VkSubpassBeginInfo* pSubpassBeginInfo) const = 0;
 virtual void                           cmdNextSubpass2                                                                 (VkCommandBuffer commandBuffer, const VkSubpassBeginInfo* pSubpassBeginInfo, const VkSubpassEndInfo* pSubpassEndInfo) const = 0;
 virtual void                           cmdEndRenderPass2                                                               (VkCommandBuffer commandBuffer, const VkSubpassEndInfo* pSubpassEndInfo) const = 0;
-virtual void                           resetQueryPool                                                                  (VkDevice device, VkQueryPool queryPool, deUint32 firstQuery, deUint32 queryCount) const = 0;
+virtual void                           resetQueryPool                                                                  (VkDevice device, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount) const = 0;
 virtual VkResult                       getSemaphoreCounterValue                                                (VkDevice device, VkSemaphore semaphore, deUint64* pValue) const = 0;
 virtual VkResult                       waitSemaphores                                                                  (VkDevice device, const VkSemaphoreWaitInfo* pWaitInfo, deUint64 timeout) const = 0;
 virtual VkResult                       signalSemaphore                                                                 (VkDevice device, const VkSemaphoreSignalInfo* pSignalInfo) const = 0;
@@ -153,19 +153,19 @@ virtual uint64_t                  getBufferOpaqueCaptureAddress                                   (VkDevice device, const VkB
 virtual uint64_t                       getDeviceMemoryOpaqueCaptureAddress                             (VkDevice device, const VkDeviceMemoryOpaqueCaptureAddressInfo* pInfo) const = 0;
 virtual VkResult                       createSwapchainKHR                                                              (VkDevice device, const VkSwapchainCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSwapchainKHR* pSwapchain) const = 0;
 virtual void                           destroySwapchainKHR                                                             (VkDevice device, VkSwapchainKHR swapchain, const VkAllocationCallbacks* pAllocator) const = 0;
-virtual VkResult                       getSwapchainImagesKHR                                                   (VkDevice device, VkSwapchainKHR swapchain, deUint32* pSwapchainImageCount, VkImage* pSwapchainImages) const = 0;
-virtual VkResult                       acquireNextImageKHR                                                             (VkDevice device, VkSwapchainKHR swapchain, deUint64 timeout, VkSemaphore semaphore, VkFence fence, deUint32* pImageIndex) const = 0;
+virtual VkResult                       getSwapchainImagesKHR                                                   (VkDevice device, VkSwapchainKHR swapchain, uint32_t* pSwapchainImageCount, VkImage* pSwapchainImages) const = 0;
+virtual VkResult                       acquireNextImageKHR                                                             (VkDevice device, VkSwapchainKHR swapchain, deUint64 timeout, VkSemaphore semaphore, VkFence fence, uint32_t* pImageIndex) const = 0;
 virtual VkResult                       queuePresentKHR                                                                 (VkQueue queue, const VkPresentInfoKHR* pPresentInfo) const = 0;
 virtual VkResult                       getDeviceGroupPresentCapabilitiesKHR                    (VkDevice device, VkDeviceGroupPresentCapabilitiesKHR* pDeviceGroupPresentCapabilities) const = 0;
 virtual VkResult                       getDeviceGroupSurfacePresentModesKHR                    (VkDevice device, VkSurfaceKHR surface, VkDeviceGroupPresentModeFlagsKHR* pModes) const = 0;
-virtual VkResult                       acquireNextImage2KHR                                                    (VkDevice device, const VkAcquireNextImageInfoKHR* pAcquireInfo, deUint32* pImageIndex) const = 0;
-virtual VkResult                       createSharedSwapchainsKHR                                               (VkDevice device, deUint32 swapchainCount, const VkSwapchainCreateInfoKHR* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkSwapchainKHR* pSwapchains) const = 0;
+virtual VkResult                       acquireNextImage2KHR                                                    (VkDevice device, const VkAcquireNextImageInfoKHR* pAcquireInfo, uint32_t* pImageIndex) const = 0;
+virtual VkResult                       createSharedSwapchainsKHR                                               (VkDevice device, uint32_t swapchainCount, const VkSwapchainCreateInfoKHR* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkSwapchainKHR* pSwapchains) const = 0;
 virtual VkResult                       getMemoryFdKHR                                                                  (VkDevice device, const VkMemoryGetFdInfoKHR* pGetFdInfo, int* pFd) const = 0;
 virtual VkResult                       getMemoryFdPropertiesKHR                                                (VkDevice device, VkExternalMemoryHandleTypeFlagBits handleType, int fd, VkMemoryFdPropertiesKHR* pMemoryFdProperties) const = 0;
 virtual VkResult                       importSemaphoreFdKHR                                                    (VkDevice device, const VkImportSemaphoreFdInfoKHR* pImportSemaphoreFdInfo) const = 0;
 virtual VkResult                       getSemaphoreFdKHR                                                               (VkDevice device, const VkSemaphoreGetFdInfoKHR* pGetFdInfo, int* pFd) const = 0;
-virtual void                           cmdPushDescriptorSetKHR                                                 (VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, deUint32 set, deUint32 descriptorWriteCount, const VkWriteDescriptorSet* pDescriptorWrites) const = 0;
-virtual void                           cmdPushDescriptorSetWithTemplateKHR                             (VkCommandBuffer commandBuffer, VkDescriptorUpdateTemplate descriptorUpdateTemplate, VkPipelineLayout layout, deUint32 set, const void* pData) const = 0;
+virtual void                           cmdPushDescriptorSetKHR                                                 (VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, uint32_t set, uint32_t descriptorWriteCount, const VkWriteDescriptorSet* pDescriptorWrites) const = 0;
+virtual void                           cmdPushDescriptorSetWithTemplateKHR                             (VkCommandBuffer commandBuffer, VkDescriptorUpdateTemplate descriptorUpdateTemplate, VkPipelineLayout layout, uint32_t set, const void* pData) const = 0;
 virtual VkResult                       getSwapchainStatusKHR                                                   (VkDevice device, VkSwapchainKHR swapchain) const = 0;
 virtual VkResult                       importFenceFdKHR                                                                (VkDevice device, const VkImportFenceFdInfoKHR* pImportFenceFdInfo) const = 0;
 virtual VkResult                       getFenceFdKHR                                                                   (VkDevice device, const VkFenceGetFdInfoKHR* pGetFdInfo, int* pFd) const = 0;
@@ -177,17 +177,17 @@ virtual void                              destroyDeferredOperationKHR                                             (VkDevice device, VkDeferredOpe
 virtual uint32_t                       getDeferredOperationMaxConcurrencyKHR                   (VkDevice device, VkDeferredOperationKHR operation) const = 0;
 virtual VkResult                       getDeferredOperationResultKHR                                   (VkDevice device, VkDeferredOperationKHR operation) const = 0;
 virtual VkResult                       deferredOperationJoinKHR                                                (VkDevice device, VkDeferredOperationKHR operation) const = 0;
-virtual VkResult                       getPipelineExecutablePropertiesKHR                              (VkDevice device, const VkPipelineInfoKHR* pPipelineInfo, deUint32* pExecutableCount, VkPipelineExecutablePropertiesKHR* pProperties) const = 0;
-virtual VkResult                       getPipelineExecutableStatisticsKHR                              (VkDevice device, const VkPipelineExecutableInfoKHR* pExecutableInfo, deUint32* pStatisticCount, VkPipelineExecutableStatisticKHR* pStatistics) const = 0;
-virtual VkResult                       getPipelineExecutableInternalRepresentationsKHR (VkDevice device, const VkPipelineExecutableInfoKHR* pExecutableInfo, deUint32* pInternalRepresentationCount, VkPipelineExecutableInternalRepresentationKHR* pInternalRepresentations) const = 0;
+virtual VkResult                       getPipelineExecutablePropertiesKHR                              (VkDevice device, const VkPipelineInfoKHR* pPipelineInfo, uint32_t* pExecutableCount, VkPipelineExecutablePropertiesKHR* pProperties) const = 0;
+virtual VkResult                       getPipelineExecutableStatisticsKHR                              (VkDevice device, const VkPipelineExecutableInfoKHR* pExecutableInfo, uint32_t* pStatisticCount, VkPipelineExecutableStatisticKHR* pStatistics) const = 0;
+virtual VkResult                       getPipelineExecutableInternalRepresentationsKHR (VkDevice device, const VkPipelineExecutableInfoKHR* pExecutableInfo, uint32_t* pInternalRepresentationCount, VkPipelineExecutableInternalRepresentationKHR* pInternalRepresentations) const = 0;
 virtual void                           cmdSetEvent2KHR                                                                 (VkCommandBuffer commandBuffer, VkEvent event, const VkDependencyInfoKHR* pDependencyInfo) const = 0;
 virtual void                           cmdResetEvent2KHR                                                               (VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags2KHR stageMask) const = 0;
-virtual void                           cmdWaitEvents2KHR                                                               (VkCommandBuffer commandBuffer, deUint32 eventCount, const VkEvent* pEvents, const VkDependencyInfoKHR* pDependencyInfos) const = 0;
+virtual void                           cmdWaitEvents2KHR                                                               (VkCommandBuffer commandBuffer, uint32_t eventCount, const VkEvent* pEvents, const VkDependencyInfoKHR* pDependencyInfos) const = 0;
 virtual void                           cmdPipelineBarrier2KHR                                                  (VkCommandBuffer commandBuffer, const VkDependencyInfoKHR* pDependencyInfo) const = 0;
-virtual void                           cmdWriteTimestamp2KHR                                                   (VkCommandBuffer commandBuffer, VkPipelineStageFlags2KHR stage, VkQueryPool queryPool, deUint32 query) const = 0;
-virtual VkResult                       queueSubmit2KHR                                                                 (VkQueue queue, deUint32 submitCount, const VkSubmitInfo2KHR* pSubmits, VkFence fence) const = 0;
-virtual void                           cmdWriteBufferMarker2AMD                                                (VkCommandBuffer commandBuffer, VkPipelineStageFlags2KHR stage, VkBuffer dstBuffer, VkDeviceSize dstOffset, deUint32 marker) const = 0;
-virtual void                           getQueueCheckpointData2NV                                               (VkQueue queue, deUint32* pCheckpointDataCount, VkCheckpointData2NV* pCheckpointData) const = 0;
+virtual void                           cmdWriteTimestamp2KHR                                                   (VkCommandBuffer commandBuffer, VkPipelineStageFlags2KHR stage, VkQueryPool queryPool, uint32_t query) const = 0;
+virtual VkResult                       queueSubmit2KHR                                                                 (VkQueue queue, uint32_t submitCount, const VkSubmitInfo2KHR* pSubmits, VkFence fence) const = 0;
+virtual void                           cmdWriteBufferMarker2AMD                                                (VkCommandBuffer commandBuffer, VkPipelineStageFlags2KHR stage, VkBuffer dstBuffer, VkDeviceSize dstOffset, uint32_t marker) const = 0;
+virtual void                           getQueueCheckpointData2NV                                               (VkQueue queue, uint32_t* pCheckpointDataCount, VkCheckpointData2NV* pCheckpointData) const = 0;
 virtual void                           cmdCopyBuffer2KHR                                                               (VkCommandBuffer commandBuffer, const VkCopyBufferInfo2KHR* pCopyBufferInfo) const = 0;
 virtual void                           cmdCopyImage2KHR                                                                (VkCommandBuffer commandBuffer, const VkCopyImageInfo2KHR* pCopyImageInfo) const = 0;
 virtual void                           cmdCopyBufferToImage2KHR                                                (VkCommandBuffer commandBuffer, const VkCopyBufferToImageInfo2KHR* pCopyBufferToImageInfo) const = 0;
@@ -199,12 +199,12 @@ virtual VkResult                  debugMarkerSetObjectNameEXT                                             (VkDevice device, const VkDe
 virtual void                           cmdDebugMarkerBeginEXT                                                  (VkCommandBuffer commandBuffer, const VkDebugMarkerMarkerInfoEXT* pMarkerInfo) const = 0;
 virtual void                           cmdDebugMarkerEndEXT                                                    (VkCommandBuffer commandBuffer) const = 0;
 virtual void                           cmdDebugMarkerInsertEXT                                                 (VkCommandBuffer commandBuffer, const VkDebugMarkerMarkerInfoEXT* pMarkerInfo) const = 0;
-virtual void                           cmdBindTransformFeedbackBuffersEXT                              (VkCommandBuffer commandBuffer, deUint32 firstBinding, deUint32 bindingCount, const VkBuffer* pBuffers, const VkDeviceSize* pOffsets, const VkDeviceSize* pSizes) const = 0;
-virtual void                           cmdBeginTransformFeedbackEXT                                    (VkCommandBuffer commandBuffer, deUint32 firstCounterBuffer, deUint32 counterBufferCount, const VkBuffer* pCounterBuffers, const VkDeviceSize* pCounterBufferOffsets) const = 0;
-virtual void                           cmdEndTransformFeedbackEXT                                              (VkCommandBuffer commandBuffer, deUint32 firstCounterBuffer, deUint32 counterBufferCount, const VkBuffer* pCounterBuffers, const VkDeviceSize* pCounterBufferOffsets) const = 0;
-virtual void                           cmdBeginQueryIndexedEXT                                                 (VkCommandBuffer commandBuffer, VkQueryPool queryPool, deUint32 query, VkQueryControlFlags flags, deUint32 index) const = 0;
-virtual void                           cmdEndQueryIndexedEXT                                                   (VkCommandBuffer commandBuffer, VkQueryPool queryPool, deUint32 query, deUint32 index) const = 0;
-virtual void                           cmdDrawIndirectByteCountEXT                                             (VkCommandBuffer commandBuffer, deUint32 instanceCount, deUint32 firstInstance, VkBuffer counterBuffer, VkDeviceSize counterBufferOffset, deUint32 counterOffset, deUint32 vertexStride) const = 0;
+virtual void                           cmdBindTransformFeedbackBuffersEXT                              (VkCommandBuffer commandBuffer, uint32_t firstBinding, uint32_t bindingCount, const VkBuffer* pBuffers, const VkDeviceSize* pOffsets, const VkDeviceSize* pSizes) const = 0;
+virtual void                           cmdBeginTransformFeedbackEXT                                    (VkCommandBuffer commandBuffer, uint32_t firstCounterBuffer, uint32_t counterBufferCount, const VkBuffer* pCounterBuffers, const VkDeviceSize* pCounterBufferOffsets) const = 0;
+virtual void                           cmdEndTransformFeedbackEXT                                              (VkCommandBuffer commandBuffer, uint32_t firstCounterBuffer, uint32_t counterBufferCount, const VkBuffer* pCounterBuffers, const VkDeviceSize* pCounterBufferOffsets) const = 0;
+virtual void                           cmdBeginQueryIndexedEXT                                                 (VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query, VkQueryControlFlags flags, uint32_t index) const = 0;
+virtual void                           cmdEndQueryIndexedEXT                                                   (VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query, uint32_t index) const = 0;
+virtual void                           cmdDrawIndirectByteCountEXT                                             (VkCommandBuffer commandBuffer, uint32_t instanceCount, uint32_t firstInstance, VkBuffer counterBuffer, VkDeviceSize counterBufferOffset, uint32_t counterOffset, uint32_t vertexStride) const = 0;
 virtual VkResult                       createCuModuleNVX                                                               (VkDevice device, const VkCuModuleCreateInfoNVX* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkCuModuleNVX* pModule) const = 0;
 virtual VkResult                       createCuFunctionNVX                                                             (VkDevice device, const VkCuFunctionCreateInfoNVX* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkCuFunctionNVX* pFunction) const = 0;
 virtual void                           destroyCuModuleNVX                                                              (VkDevice device, VkCuModuleNVX module, const VkAllocationCallbacks* pAllocator) const = 0;
@@ -212,20 +212,20 @@ virtual void                              destroyCuFunctionNVX                                                    (VkDevice device, VkCuFunctionNVX fun
 virtual void                           cmdCuLaunchKernelNVX                                                    (VkCommandBuffer commandBuffer, const VkCuLaunchInfoNVX* pLaunchInfo) const = 0;
 virtual uint32_t                       getImageViewHandleNVX                                                   (VkDevice device, const VkImageViewHandleInfoNVX* pInfo) const = 0;
 virtual VkResult                       getImageViewAddressNVX                                                  (VkDevice device, VkImageView imageView, VkImageViewAddressPropertiesNVX* pProperties) const = 0;
-virtual void                           cmdDrawIndirectCountAMD                                                 (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, deUint32 maxDrawCount, deUint32 stride) const = 0;
-virtual void                           cmdDrawIndexedIndirectCountAMD                                  (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, deUint32 maxDrawCount, deUint32 stride) const = 0;
+virtual void                           cmdDrawIndirectCountAMD                                                 (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride) const = 0;
+virtual void                           cmdDrawIndexedIndirectCountAMD                                  (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride) const = 0;
 virtual VkResult                       getShaderInfoAMD                                                                (VkDevice device, VkPipeline pipeline, VkShaderStageFlagBits shaderStage, VkShaderInfoTypeAMD infoType, deUintptr* pInfoSize, void* pInfo) const = 0;
 virtual void                           cmdBeginConditionalRenderingEXT                                 (VkCommandBuffer commandBuffer, const VkConditionalRenderingBeginInfoEXT* pConditionalRenderingBegin) const = 0;
 virtual void                           cmdEndConditionalRenderingEXT                                   (VkCommandBuffer commandBuffer) const = 0;
-virtual void                           cmdSetViewportWScalingNV                                                (VkCommandBuffer commandBuffer, deUint32 firstViewport, deUint32 viewportCount, const VkViewportWScalingNV* pViewportWScalings) const = 0;
+virtual void                           cmdSetViewportWScalingNV                                                (VkCommandBuffer commandBuffer, uint32_t firstViewport, uint32_t viewportCount, const VkViewportWScalingNV* pViewportWScalings) const = 0;
 virtual VkResult                       displayPowerControlEXT                                                  (VkDevice device, VkDisplayKHR display, const VkDisplayPowerInfoEXT* pDisplayPowerInfo) const = 0;
 virtual VkResult                       registerDeviceEventEXT                                                  (VkDevice device, const VkDeviceEventInfoEXT* pDeviceEventInfo, const VkAllocationCallbacks* pAllocator, VkFence* pFence) const = 0;
 virtual VkResult                       registerDisplayEventEXT                                                 (VkDevice device, VkDisplayKHR display, const VkDisplayEventInfoEXT* pDisplayEventInfo, const VkAllocationCallbacks* pAllocator, VkFence* pFence) const = 0;
 virtual VkResult                       getSwapchainCounterEXT                                                  (VkDevice device, VkSwapchainKHR swapchain, VkSurfaceCounterFlagBitsEXT counter, deUint64* pCounterValue) const = 0;
 virtual VkResult                       getRefreshCycleDurationGOOGLE                                   (VkDevice device, VkSwapchainKHR swapchain, VkRefreshCycleDurationGOOGLE* pDisplayTimingProperties) const = 0;
-virtual VkResult                       getPastPresentationTimingGOOGLE                                 (VkDevice device, VkSwapchainKHR swapchain, deUint32* pPresentationTimingCount, VkPastPresentationTimingGOOGLE* pPresentationTimings) const = 0;
-virtual void                           cmdSetDiscardRectangleEXT                                               (VkCommandBuffer commandBuffer, deUint32 firstDiscardRectangle, deUint32 discardRectangleCount, const VkRect2D* pDiscardRectangles) const = 0;
-virtual void                           setHdrMetadataEXT                                                               (VkDevice device, deUint32 swapchainCount, const VkSwapchainKHR* pSwapchains, const VkHdrMetadataEXT* pMetadata) const = 0;
+virtual VkResult                       getPastPresentationTimingGOOGLE                                 (VkDevice device, VkSwapchainKHR swapchain, uint32_t* pPresentationTimingCount, VkPastPresentationTimingGOOGLE* pPresentationTimings) const = 0;
+virtual void                           cmdSetDiscardRectangleEXT                                               (VkCommandBuffer commandBuffer, uint32_t firstDiscardRectangle, uint32_t discardRectangleCount, const VkRect2D* pDiscardRectangles) const = 0;
+virtual void                           setHdrMetadataEXT                                                               (VkDevice device, uint32_t swapchainCount, const VkSwapchainKHR* pSwapchains, const VkHdrMetadataEXT* pMetadata) const = 0;
 virtual VkResult                       setDebugUtilsObjectNameEXT                                              (VkDevice device, const VkDebugUtilsObjectNameInfoEXT* pNameInfo) const = 0;
 virtual VkResult                       setDebugUtilsObjectTagEXT                                               (VkDevice device, const VkDebugUtilsObjectTagInfoEXT* pTagInfo) const = 0;
 virtual void                           queueBeginDebugUtilsLabelEXT                                    (VkQueue queue, const VkDebugUtilsLabelEXT* pLabelInfo) const = 0;
@@ -238,33 +238,33 @@ virtual void                              cmdSetSampleLocationsEXT                                                (VkCommandBuffer commandBuffer, co
 virtual VkResult                       getImageDrmFormatModifierPropertiesEXT                  (VkDevice device, VkImage image, VkImageDrmFormatModifierPropertiesEXT* pProperties) const = 0;
 virtual VkResult                       createValidationCacheEXT                                                (VkDevice device, const VkValidationCacheCreateInfoEXT* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkValidationCacheEXT* pValidationCache) const = 0;
 virtual void                           destroyValidationCacheEXT                                               (VkDevice device, VkValidationCacheEXT validationCache, const VkAllocationCallbacks* pAllocator) const = 0;
-virtual VkResult                       mergeValidationCachesEXT                                                (VkDevice device, VkValidationCacheEXT dstCache, deUint32 srcCacheCount, const VkValidationCacheEXT* pSrcCaches) const = 0;
+virtual VkResult                       mergeValidationCachesEXT                                                (VkDevice device, VkValidationCacheEXT dstCache, uint32_t srcCacheCount, const VkValidationCacheEXT* pSrcCaches) const = 0;
 virtual VkResult                       getValidationCacheDataEXT                                               (VkDevice device, VkValidationCacheEXT validationCache, deUintptr* pDataSize, void* pData) const = 0;
 virtual void                           cmdBindShadingRateImageNV                                               (VkCommandBuffer commandBuffer, VkImageView imageView, VkImageLayout imageLayout) const = 0;
-virtual void                           cmdSetViewportShadingRatePaletteNV                              (VkCommandBuffer commandBuffer, deUint32 firstViewport, deUint32 viewportCount, const VkShadingRatePaletteNV* pShadingRatePalettes) const = 0;
-virtual void                           cmdSetCoarseSampleOrderNV                                               (VkCommandBuffer commandBuffer, VkCoarseSampleOrderTypeNV sampleOrderType, deUint32 customSampleOrderCount, const VkCoarseSampleOrderCustomNV* pCustomSampleOrders) const = 0;
+virtual void                           cmdSetViewportShadingRatePaletteNV                              (VkCommandBuffer commandBuffer, uint32_t firstViewport, uint32_t viewportCount, const VkShadingRatePaletteNV* pShadingRatePalettes) const = 0;
+virtual void                           cmdSetCoarseSampleOrderNV                                               (VkCommandBuffer commandBuffer, VkCoarseSampleOrderTypeNV sampleOrderType, uint32_t customSampleOrderCount, const VkCoarseSampleOrderCustomNV* pCustomSampleOrders) const = 0;
 virtual VkResult                       createAccelerationStructureNV                                   (VkDevice device, const VkAccelerationStructureCreateInfoNV* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkAccelerationStructureNV* pAccelerationStructure) const = 0;
 virtual void                           destroyAccelerationStructureNV                                  (VkDevice device, VkAccelerationStructureNV accelerationStructure, const VkAllocationCallbacks* pAllocator) const = 0;
 virtual void                           getAccelerationStructureMemoryRequirementsNV    (VkDevice device, const VkAccelerationStructureMemoryRequirementsInfoNV* pInfo, VkMemoryRequirements2KHR* pMemoryRequirements) const = 0;
-virtual VkResult                       bindAccelerationStructureMemoryNV                               (VkDevice device, deUint32 bindInfoCount, const VkBindAccelerationStructureMemoryInfoNV* pBindInfos) const = 0;
+virtual VkResult                       bindAccelerationStructureMemoryNV                               (VkDevice device, uint32_t bindInfoCount, const VkBindAccelerationStructureMemoryInfoNV* pBindInfos) const = 0;
 virtual void                           cmdBuildAccelerationStructureNV                                 (VkCommandBuffer commandBuffer, const VkAccelerationStructureInfoNV* pInfo, VkBuffer instanceData, VkDeviceSize instanceOffset, VkBool32 update, VkAccelerationStructureNV dst, VkAccelerationStructureNV src, VkBuffer scratch, VkDeviceSize scratchOffset) const = 0;
 virtual void                           cmdCopyAccelerationStructureNV                                  (VkCommandBuffer commandBuffer, VkAccelerationStructureNV dst, VkAccelerationStructureNV src, VkCopyAccelerationStructureModeKHR mode) const = 0;
-virtual void                           cmdTraceRaysNV                                                                  (VkCommandBuffer commandBuffer, VkBuffer raygenShaderBindingTableBuffer, VkDeviceSize raygenShaderBindingOffset, VkBuffer missShaderBindingTableBuffer, VkDeviceSize missShaderBindingOffset, VkDeviceSize missShaderBindingStride, VkBuffer hitShaderBindingTableBuffer, VkDeviceSize hitShaderBindingOffset, VkDeviceSize hitShaderBindingStride, VkBuffer callableShaderBindingTableBuffer, VkDeviceSize callableShaderBindingOffset, VkDeviceSize callableShaderBindingStride, deUint32 width, deUint32 height, deUint32 depth) const = 0;
-virtual VkResult                       createRayTracingPipelinesNV                                             (VkDevice device, VkPipelineCache pipelineCache, deUint32 createInfoCount, const VkRayTracingPipelineCreateInfoNV* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkPipeline* pPipelines) const = 0;
-virtual VkResult                       getRayTracingShaderGroupHandlesKHR                              (VkDevice device, VkPipeline pipeline, deUint32 firstGroup, deUint32 groupCount, deUintptr dataSize, void* pData) const = 0;
-virtual VkResult                       getRayTracingShaderGroupHandlesNV                               (VkDevice device, VkPipeline pipeline, deUint32 firstGroup, deUint32 groupCount, deUintptr dataSize, void* pData) const = 0;
+virtual void                           cmdTraceRaysNV                                                                  (VkCommandBuffer commandBuffer, VkBuffer raygenShaderBindingTableBuffer, VkDeviceSize raygenShaderBindingOffset, VkBuffer missShaderBindingTableBuffer, VkDeviceSize missShaderBindingOffset, VkDeviceSize missShaderBindingStride, VkBuffer hitShaderBindingTableBuffer, VkDeviceSize hitShaderBindingOffset, VkDeviceSize hitShaderBindingStride, VkBuffer callableShaderBindingTableBuffer, VkDeviceSize callableShaderBindingOffset, VkDeviceSize callableShaderBindingStride, uint32_t width, uint32_t height, uint32_t depth) const = 0;
+virtual VkResult                       createRayTracingPipelinesNV                                             (VkDevice device, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkRayTracingPipelineCreateInfoNV* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkPipeline* pPipelines) const = 0;
+virtual VkResult                       getRayTracingShaderGroupHandlesKHR                              (VkDevice device, VkPipeline pipeline, uint32_t firstGroup, uint32_t groupCount, deUintptr dataSize, void* pData) const = 0;
+virtual VkResult                       getRayTracingShaderGroupHandlesNV                               (VkDevice device, VkPipeline pipeline, uint32_t firstGroup, uint32_t groupCount, deUintptr dataSize, void* pData) const = 0;
 virtual VkResult                       getAccelerationStructureHandleNV                                (VkDevice device, VkAccelerationStructureNV accelerationStructure, deUintptr dataSize, void* pData) const = 0;
-virtual void                           cmdWriteAccelerationStructuresPropertiesNV              (VkCommandBuffer commandBuffer, deUint32 accelerationStructureCount, const VkAccelerationStructureNV* pAccelerationStructures, VkQueryType queryType, VkQueryPool queryPool, deUint32 firstQuery) const = 0;
-virtual VkResult                       compileDeferredNV                                                               (VkDevice device, VkPipeline pipeline, deUint32 shader) const = 0;
+virtual void                           cmdWriteAccelerationStructuresPropertiesNV              (VkCommandBuffer commandBuffer, uint32_t accelerationStructureCount, const VkAccelerationStructureNV* pAccelerationStructures, VkQueryType queryType, VkQueryPool queryPool, uint32_t firstQuery) const = 0;
+virtual VkResult                       compileDeferredNV                                                               (VkDevice device, VkPipeline pipeline, uint32_t shader) const = 0;
 virtual VkResult                       getMemoryHostPointerPropertiesEXT                               (VkDevice device, VkExternalMemoryHandleTypeFlagBits handleType, const void* pHostPointer, VkMemoryHostPointerPropertiesEXT* pMemoryHostPointerProperties) const = 0;
-virtual void                           cmdWriteBufferMarkerAMD                                                 (VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkBuffer dstBuffer, VkDeviceSize dstOffset, deUint32 marker) const = 0;
-virtual VkResult                       getCalibratedTimestampsEXT                                              (VkDevice device, deUint32 timestampCount, const VkCalibratedTimestampInfoEXT* pTimestampInfos, deUint64* pTimestamps, deUint64* pMaxDeviation) const = 0;
-virtual void                           cmdDrawMeshTasksNV                                                              (VkCommandBuffer commandBuffer, deUint32 taskCount, deUint32 firstTask) const = 0;
-virtual void                           cmdDrawMeshTasksIndirectNV                                              (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, deUint32 drawCount, deUint32 stride) const = 0;
-virtual void                           cmdDrawMeshTasksIndirectCountNV                                 (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, deUint32 maxDrawCount, deUint32 stride) const = 0;
-virtual void                           cmdSetExclusiveScissorNV                                                (VkCommandBuffer commandBuffer, deUint32 firstExclusiveScissor, deUint32 exclusiveScissorCount, const VkRect2D* pExclusiveScissors) const = 0;
+virtual void                           cmdWriteBufferMarkerAMD                                                 (VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkBuffer dstBuffer, VkDeviceSize dstOffset, uint32_t marker) const = 0;
+virtual VkResult                       getCalibratedTimestampsEXT                                              (VkDevice device, uint32_t timestampCount, const VkCalibratedTimestampInfoEXT* pTimestampInfos, deUint64* pTimestamps, deUint64* pMaxDeviation) const = 0;
+virtual void                           cmdDrawMeshTasksNV                                                              (VkCommandBuffer commandBuffer, uint32_t taskCount, uint32_t firstTask) const = 0;
+virtual void                           cmdDrawMeshTasksIndirectNV                                              (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride) const = 0;
+virtual void                           cmdDrawMeshTasksIndirectCountNV                                 (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride) const = 0;
+virtual void                           cmdSetExclusiveScissorNV                                                (VkCommandBuffer commandBuffer, uint32_t firstExclusiveScissor, uint32_t exclusiveScissorCount, const VkRect2D* pExclusiveScissors) const = 0;
 virtual void                           cmdSetCheckpointNV                                                              (VkCommandBuffer commandBuffer, const void* pCheckpointMarker) const = 0;
-virtual void                           getQueueCheckpointDataNV                                                (VkQueue queue, deUint32* pCheckpointDataCount, VkCheckpointDataNV* pCheckpointData) const = 0;
+virtual void                           getQueueCheckpointDataNV                                                (VkQueue queue, uint32_t* pCheckpointDataCount, VkCheckpointDataNV* pCheckpointData) const = 0;
 virtual VkResult                       initializePerformanceApiINTEL                                   (VkDevice device, const VkInitializePerformanceApiInfoINTEL* pInitializeInfo) const = 0;
 virtual void                           uninitializePerformanceApiINTEL                                 (VkDevice device) const = 0;
 virtual VkResult                       cmdSetPerformanceMarkerINTEL                                    (VkCommandBuffer commandBuffer, const VkPerformanceMarkerInfoINTEL* pMarkerInfo) const = 0;
@@ -276,13 +276,13 @@ virtual VkResult                  queueSetPerformanceConfigurationINTEL                   (VkQueue queue, VkPer
 virtual VkResult                       getPerformanceParameterINTEL                                    (VkDevice device, VkPerformanceParameterTypeINTEL parameter, VkPerformanceValueINTEL* pValue) const = 0;
 virtual void                           setLocalDimmingAMD                                                              (VkDevice device, VkSwapchainKHR swapChain, VkBool32 localDimmingEnable) const = 0;
 virtual VkDeviceAddress                getBufferDeviceAddressEXT                                               (VkDevice device, const VkBufferDeviceAddressInfo* pInfo) const = 0;
-virtual void                           cmdSetLineStippleEXT                                                    (VkCommandBuffer commandBuffer, deUint32 lineStippleFactor, deUint16 lineStipplePattern) const = 0;
+virtual void                           cmdSetLineStippleEXT                                                    (VkCommandBuffer commandBuffer, uint32_t lineStippleFactor, deUint16 lineStipplePattern) const = 0;
 virtual void                           cmdSetCullModeEXT                                                               (VkCommandBuffer commandBuffer, VkCullModeFlags cullMode) const = 0;
 virtual void                           cmdSetFrontFaceEXT                                                              (VkCommandBuffer commandBuffer, VkFrontFace frontFace) const = 0;
 virtual void                           cmdSetPrimitiveTopologyEXT                                              (VkCommandBuffer commandBuffer, VkPrimitiveTopology primitiveTopology) const = 0;
-virtual void                           cmdSetViewportWithCountEXT                                              (VkCommandBuffer commandBuffer, deUint32 viewportCount, const VkViewport* pViewports) const = 0;
-virtual void                           cmdSetScissorWithCountEXT                                               (VkCommandBuffer commandBuffer, deUint32 scissorCount, const VkRect2D* pScissors) const = 0;
-virtual void                           cmdBindVertexBuffers2EXT                                                (VkCommandBuffer commandBuffer, deUint32 firstBinding, deUint32 bindingCount, const VkBuffer* pBuffers, const VkDeviceSize* pOffsets, const VkDeviceSize* pSizes, const VkDeviceSize* pStrides) const = 0;
+virtual void                           cmdSetViewportWithCountEXT                                              (VkCommandBuffer commandBuffer, uint32_t viewportCount, const VkViewport* pViewports) const = 0;
+virtual void                           cmdSetScissorWithCountEXT                                               (VkCommandBuffer commandBuffer, uint32_t scissorCount, const VkRect2D* pScissors) const = 0;
+virtual void                           cmdBindVertexBuffers2EXT                                                (VkCommandBuffer commandBuffer, uint32_t firstBinding, uint32_t bindingCount, const VkBuffer* pBuffers, const VkDeviceSize* pOffsets, const VkDeviceSize* pSizes, const VkDeviceSize* pStrides) const = 0;
 virtual void                           cmdSetDepthTestEnableEXT                                                (VkCommandBuffer commandBuffer, VkBool32 depthTestEnable) const = 0;
 virtual void                           cmdSetDepthWriteEnableEXT                                               (VkCommandBuffer commandBuffer, VkBool32 depthWriteEnable) const = 0;
 virtual void                           cmdSetDepthCompareOpEXT                                                 (VkCommandBuffer commandBuffer, VkCompareOp depthCompareOp) const = 0;
@@ -292,7 +292,7 @@ virtual void                                cmdSetStencilOpEXT                                                              (VkCommandBuffer commandBuffer, VkSten
 virtual void                           getGeneratedCommandsMemoryRequirementsNV                (VkDevice device, const VkGeneratedCommandsMemoryRequirementsInfoNV* pInfo, VkMemoryRequirements2* pMemoryRequirements) const = 0;
 virtual void                           cmdPreprocessGeneratedCommandsNV                                (VkCommandBuffer commandBuffer, const VkGeneratedCommandsInfoNV* pGeneratedCommandsInfo) const = 0;
 virtual void                           cmdExecuteGeneratedCommandsNV                                   (VkCommandBuffer commandBuffer, VkBool32 isPreprocessed, const VkGeneratedCommandsInfoNV* pGeneratedCommandsInfo) const = 0;
-virtual void                           cmdBindPipelineShaderGroupNV                                    (VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline pipeline, deUint32 groupIndex) const = 0;
+virtual void                           cmdBindPipelineShaderGroupNV                                    (VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline pipeline, uint32_t groupIndex) const = 0;
 virtual VkResult                       createIndirectCommandsLayoutNV                                  (VkDevice device, const VkIndirectCommandsLayoutCreateInfoNV* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkIndirectCommandsLayoutNV* pIndirectCommandsLayout) const = 0;
 virtual void                           destroyIndirectCommandsLayoutNV                                 (VkDevice device, VkIndirectCommandsLayoutNV indirectCommandsLayout, const VkAllocationCallbacks* pAllocator) const = 0;
 virtual VkResult                       createPrivateDataSlotEXT                                                (VkDevice device, const VkPrivateDataSlotCreateInfoEXT* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkPrivateDataSlotEXT* pPrivateDataSlot) const = 0;
@@ -300,46 +300,46 @@ virtual void                              destroyPrivateDataSlotEXT                                               (VkDevice device, VkPrivateDataSl
 virtual VkResult                       setPrivateDataEXT                                                               (VkDevice device, VkObjectType objectType, deUint64 objectHandle, VkPrivateDataSlotEXT privateDataSlot, deUint64 data) const = 0;
 virtual void                           getPrivateDataEXT                                                               (VkDevice device, VkObjectType objectType, deUint64 objectHandle, VkPrivateDataSlotEXT privateDataSlot, deUint64* pData) const = 0;
 virtual void                           cmdSetFragmentShadingRateEnumNV                                 (VkCommandBuffer commandBuffer, VkFragmentShadingRateNV shadingRate, const VkFragmentShadingRateCombinerOpKHR combinerOps[2]) const = 0;
-virtual void                           cmdSetVertexInputEXT                                                    (VkCommandBuffer commandBuffer, deUint32 vertexBindingDescriptionCount, const VkVertexInputBindingDescription2EXT* pVertexBindingDescriptions, deUint32 vertexAttributeDescriptionCount, const VkVertexInputAttributeDescription2EXT* pVertexAttributeDescriptions) const = 0;
+virtual void                           cmdSetVertexInputEXT                                                    (VkCommandBuffer commandBuffer, uint32_t vertexBindingDescriptionCount, const VkVertexInputBindingDescription2EXT* pVertexBindingDescriptions, uint32_t vertexAttributeDescriptionCount, const VkVertexInputAttributeDescription2EXT* pVertexAttributeDescriptions) const = 0;
 virtual VkResult                       getDeviceSubpassShadingMaxWorkgroupSizeHUAWEI   (VkDevice device, VkRenderPass renderpass, VkExtent2D* pMaxWorkgroupSize) const = 0;
 virtual void                           cmdSubpassShadingHUAWEI                                                 (VkCommandBuffer commandBuffer) const = 0;
 virtual VkResult                       getMemoryRemoteAddressNV                                                (VkDevice device, const VkMemoryGetRemoteAddressInfoNV* getMemoryRemoteAddressInfo, VkRemoteAddressNV* pAddress) const = 0;
-virtual void                           cmdSetPatchControlPointsEXT                                             (VkCommandBuffer commandBuffer, deUint32 patchControlPoints) const = 0;
+virtual void                           cmdSetPatchControlPointsEXT                                             (VkCommandBuffer commandBuffer, uint32_t patchControlPoints) const = 0;
 virtual void                           cmdSetRasterizerDiscardEnableEXT                                (VkCommandBuffer commandBuffer, VkBool32 rasterizerDiscardEnable) const = 0;
 virtual void                           cmdSetDepthBiasEnableEXT                                                (VkCommandBuffer commandBuffer, VkBool32 depthBiasEnable) const = 0;
 virtual void                           cmdSetLogicOpEXT                                                                (VkCommandBuffer commandBuffer, VkLogicOp logicOp) const = 0;
 virtual void                           cmdSetPrimitiveRestartEnableEXT                                 (VkCommandBuffer commandBuffer, VkBool32 primitiveRestartEnable) const = 0;
-virtual void                           cmdSetColorWriteEnableEXT                                               (VkCommandBuffer commandBuffer, deUint32 attachmentCount, const VkBool32* pColorWriteEnables) const = 0;
-virtual void                           cmdDrawMultiEXT                                                                 (VkCommandBuffer commandBuffer, deUint32 drawCount, const VkMultiDrawInfoEXT* pVertexInfo, deUint32 instanceCount, deUint32 firstInstance, deUint32 stride) const = 0;
-virtual void                           cmdDrawMultiIndexedEXT                                                  (VkCommandBuffer commandBuffer, deUint32 drawCount, const VkMultiDrawIndexedInfoEXT* pIndexInfo, deUint32 instanceCount, deUint32 firstInstance, deUint32 stride, const deInt32* pVertexOffset) const = 0;
+virtual void                           cmdSetColorWriteEnableEXT                                               (VkCommandBuffer commandBuffer, uint32_t attachmentCount, const VkBool32* pColorWriteEnables) const = 0;
+virtual void                           cmdDrawMultiEXT                                                                 (VkCommandBuffer commandBuffer, uint32_t drawCount, const VkMultiDrawInfoEXT* pVertexInfo, uint32_t instanceCount, uint32_t firstInstance, uint32_t stride) const = 0;
+virtual void                           cmdDrawMultiIndexedEXT                                                  (VkCommandBuffer commandBuffer, uint32_t drawCount, const VkMultiDrawIndexedInfoEXT* pIndexInfo, uint32_t instanceCount, uint32_t firstInstance, uint32_t stride, const int32_t* pVertexOffset) const = 0;
 virtual VkResult                       createAccelerationStructureKHR                                  (VkDevice device, const VkAccelerationStructureCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkAccelerationStructureKHR* pAccelerationStructure) const = 0;
 virtual void                           destroyAccelerationStructureKHR                                 (VkDevice device, VkAccelerationStructureKHR accelerationStructure, const VkAllocationCallbacks* pAllocator) const = 0;
-virtual void                           cmdBuildAccelerationStructuresKHR                               (VkCommandBuffer commandBuffer, deUint32 infoCount, const VkAccelerationStructureBuildGeometryInfoKHR* pInfos, const VkAccelerationStructureBuildRangeInfoKHR* const* ppBuildRangeInfos) const = 0;
-virtual void                           cmdBuildAccelerationStructuresIndirectKHR               (VkCommandBuffer commandBuffer, deUint32 infoCount, const VkAccelerationStructureBuildGeometryInfoKHR* pInfos, const VkDeviceAddress* pIndirectDeviceAddresses, const deUint32* pIndirectStrides, const deUint32* const* ppMaxPrimitiveCounts) const = 0;
-virtual VkResult                       buildAccelerationStructuresKHR                                  (VkDevice device, VkDeferredOperationKHR deferredOperation, deUint32 infoCount, const VkAccelerationStructureBuildGeometryInfoKHR* pInfos, const VkAccelerationStructureBuildRangeInfoKHR* const* ppBuildRangeInfos) const = 0;
+virtual void                           cmdBuildAccelerationStructuresKHR                               (VkCommandBuffer commandBuffer, uint32_t infoCount, const VkAccelerationStructureBuildGeometryInfoKHR* pInfos, const VkAccelerationStructureBuildRangeInfoKHR* const* ppBuildRangeInfos) const = 0;
+virtual void                           cmdBuildAccelerationStructuresIndirectKHR               (VkCommandBuffer commandBuffer, uint32_t infoCount, const VkAccelerationStructureBuildGeometryInfoKHR* pInfos, const VkDeviceAddress* pIndirectDeviceAddresses, const uint32_t* pIndirectStrides, const uint32_t* const* ppMaxPrimitiveCounts) const = 0;
+virtual VkResult                       buildAccelerationStructuresKHR                                  (VkDevice device, VkDeferredOperationKHR deferredOperation, uint32_t infoCount, const VkAccelerationStructureBuildGeometryInfoKHR* pInfos, const VkAccelerationStructureBuildRangeInfoKHR* const* ppBuildRangeInfos) const = 0;
 virtual VkResult                       copyAccelerationStructureKHR                                    (VkDevice device, VkDeferredOperationKHR deferredOperation, const VkCopyAccelerationStructureInfoKHR* pInfo) const = 0;
 virtual VkResult                       copyAccelerationStructureToMemoryKHR                    (VkDevice device, VkDeferredOperationKHR deferredOperation, const VkCopyAccelerationStructureToMemoryInfoKHR* pInfo) const = 0;
 virtual VkResult                       copyMemoryToAccelerationStructureKHR                    (VkDevice device, VkDeferredOperationKHR deferredOperation, const VkCopyMemoryToAccelerationStructureInfoKHR* pInfo) const = 0;
-virtual VkResult                       writeAccelerationStructuresPropertiesKHR                (VkDevice device, deUint32 accelerationStructureCount, const VkAccelerationStructureKHR* pAccelerationStructures, VkQueryType queryType, deUintptr dataSize, void* pData, deUintptr stride) const = 0;
+virtual VkResult                       writeAccelerationStructuresPropertiesKHR                (VkDevice device, uint32_t accelerationStructureCount, const VkAccelerationStructureKHR* pAccelerationStructures, VkQueryType queryType, deUintptr dataSize, void* pData, deUintptr stride) const = 0;
 virtual void                           cmdCopyAccelerationStructureKHR                                 (VkCommandBuffer commandBuffer, const VkCopyAccelerationStructureInfoKHR* pInfo) const = 0;
 virtual void                           cmdCopyAccelerationStructureToMemoryKHR                 (VkCommandBuffer commandBuffer, const VkCopyAccelerationStructureToMemoryInfoKHR* pInfo) const = 0;
 virtual void                           cmdCopyMemoryToAccelerationStructureKHR                 (VkCommandBuffer commandBuffer, const VkCopyMemoryToAccelerationStructureInfoKHR* pInfo) const = 0;
 virtual VkDeviceAddress                getAccelerationStructureDeviceAddressKHR                (VkDevice device, const VkAccelerationStructureDeviceAddressInfoKHR* pInfo) const = 0;
-virtual void                           cmdWriteAccelerationStructuresPropertiesKHR             (VkCommandBuffer commandBuffer, deUint32 accelerationStructureCount, const VkAccelerationStructureKHR* pAccelerationStructures, VkQueryType queryType, VkQueryPool queryPool, deUint32 firstQuery) const = 0;
+virtual void                           cmdWriteAccelerationStructuresPropertiesKHR             (VkCommandBuffer commandBuffer, uint32_t accelerationStructureCount, const VkAccelerationStructureKHR* pAccelerationStructures, VkQueryType queryType, VkQueryPool queryPool, uint32_t firstQuery) const = 0;
 virtual void                           getDeviceAccelerationStructureCompatibilityKHR  (VkDevice device, const VkAccelerationStructureVersionInfoKHR* pVersionInfo, VkAccelerationStructureCompatibilityKHR* pCompatibility) const = 0;
-virtual void                           getAccelerationStructureBuildSizesKHR                   (VkDevice device, VkAccelerationStructureBuildTypeKHR buildType, const VkAccelerationStructureBuildGeometryInfoKHR* pBuildInfo, const deUint32* pMaxPrimitiveCounts, VkAccelerationStructureBuildSizesInfoKHR* pSizeInfo) const = 0;
-virtual void                           cmdTraceRaysKHR                                                                 (VkCommandBuffer commandBuffer, const VkStridedDeviceAddressRegionKHR* pRaygenShaderBindingTable, const VkStridedDeviceAddressRegionKHR* pMissShaderBindingTable, const VkStridedDeviceAddressRegionKHR* pHitShaderBindingTable, const VkStridedDeviceAddressRegionKHR* pCallableShaderBindingTable, deUint32 width, deUint32 height, deUint32 depth) const = 0;
-virtual VkResult                       createRayTracingPipelinesKHR                                    (VkDevice device, VkDeferredOperationKHR deferredOperation, VkPipelineCache pipelineCache, deUint32 createInfoCount, const VkRayTracingPipelineCreateInfoKHR* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkPipeline* pPipelines) const = 0;
-virtual VkResult                       getRayTracingCaptureReplayShaderGroupHandlesKHR (VkDevice device, VkPipeline pipeline, deUint32 firstGroup, deUint32 groupCount, deUintptr dataSize, void* pData) const = 0;
+virtual void                           getAccelerationStructureBuildSizesKHR                   (VkDevice device, VkAccelerationStructureBuildTypeKHR buildType, const VkAccelerationStructureBuildGeometryInfoKHR* pBuildInfo, const uint32_t* pMaxPrimitiveCounts, VkAccelerationStructureBuildSizesInfoKHR* pSizeInfo) const = 0;
+virtual void                           cmdTraceRaysKHR                                                                 (VkCommandBuffer commandBuffer, const VkStridedDeviceAddressRegionKHR* pRaygenShaderBindingTable, const VkStridedDeviceAddressRegionKHR* pMissShaderBindingTable, const VkStridedDeviceAddressRegionKHR* pHitShaderBindingTable, const VkStridedDeviceAddressRegionKHR* pCallableShaderBindingTable, uint32_t width, uint32_t height, uint32_t depth) const = 0;
+virtual VkResult                       createRayTracingPipelinesKHR                                    (VkDevice device, VkDeferredOperationKHR deferredOperation, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkRayTracingPipelineCreateInfoKHR* pCreateInfos, const VkAllocationCallbacks* pAllocator, VkPipeline* pPipelines) const = 0;
+virtual VkResult                       getRayTracingCaptureReplayShaderGroupHandlesKHR (VkDevice device, VkPipeline pipeline, uint32_t firstGroup, uint32_t groupCount, deUintptr dataSize, void* pData) const = 0;
 virtual void                           cmdTraceRaysIndirectKHR                                                 (VkCommandBuffer commandBuffer, const VkStridedDeviceAddressRegionKHR* pRaygenShaderBindingTable, const VkStridedDeviceAddressRegionKHR* pMissShaderBindingTable, const VkStridedDeviceAddressRegionKHR* pHitShaderBindingTable, const VkStridedDeviceAddressRegionKHR* pCallableShaderBindingTable, VkDeviceAddress indirectDeviceAddress) const = 0;
-virtual VkDeviceSize           getRayTracingShaderGroupStackSizeKHR                    (VkDevice device, VkPipeline pipeline, deUint32 group, VkShaderGroupShaderKHR groupShader) const = 0;
-virtual void                           cmdSetRayTracingPipelineStackSizeKHR                    (VkCommandBuffer commandBuffer, deUint32 pipelineStackSize) const = 0;
+virtual VkDeviceSize           getRayTracingShaderGroupStackSizeKHR                    (VkDevice device, VkPipeline pipeline, uint32_t group, VkShaderGroupShaderKHR groupShader) const = 0;
+virtual void                           cmdSetRayTracingPipelineStackSizeKHR                    (VkCommandBuffer commandBuffer, uint32_t pipelineStackSize) const = 0;
 virtual VkResult                       getAndroidHardwareBufferPropertiesANDROID               (VkDevice device, const struct pt::AndroidHardwareBufferPtr buffer, VkAndroidHardwareBufferPropertiesANDROID* pProperties) const = 0;
 virtual VkResult                       getMemoryAndroidHardwareBufferANDROID                   (VkDevice device, const VkMemoryGetAndroidHardwareBufferInfoANDROID* pInfo, struct pt::AndroidHardwareBufferPtr* pBuffer) const = 0;
 virtual VkResult                       createVideoSessionKHR                                                   (VkDevice device, const VkVideoSessionCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkVideoSessionKHR* pVideoSession) const = 0;
 virtual void                           destroyVideoSessionKHR                                                  (VkDevice device, VkVideoSessionKHR videoSession, const VkAllocationCallbacks* pAllocator) const = 0;
-virtual VkResult                       getVideoSessionMemoryRequirementsKHR                    (VkDevice device, VkVideoSessionKHR videoSession, deUint32* pVideoSessionMemoryRequirementsCount, VkVideoGetMemoryPropertiesKHR* pVideoSessionMemoryRequirements) const = 0;
-virtual VkResult                       bindVideoSessionMemoryKHR                                               (VkDevice device, VkVideoSessionKHR videoSession, deUint32 videoSessionBindMemoryCount, const VkVideoBindMemoryKHR* pVideoSessionBindMemories) const = 0;
+virtual VkResult                       getVideoSessionMemoryRequirementsKHR                    (VkDevice device, VkVideoSessionKHR videoSession, uint32_t* pVideoSessionMemoryRequirementsCount, VkVideoGetMemoryPropertiesKHR* pVideoSessionMemoryRequirements) const = 0;
+virtual VkResult                       bindVideoSessionMemoryKHR                                               (VkDevice device, VkVideoSessionKHR videoSession, uint32_t videoSessionBindMemoryCount, const VkVideoBindMemoryKHR* pVideoSessionBindMemories) const = 0;
 virtual VkResult                       createVideoSessionParametersKHR                                 (VkDevice device, const VkVideoSessionParametersCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkVideoSessionParametersKHR* pVideoSessionParameters) const = 0;
 virtual VkResult                       updateVideoSessionParametersKHR                                 (VkDevice device, VkVideoSessionParametersKHR videoSessionParameters, const VkVideoSessionParametersUpdateInfoKHR* pUpdateInfo) const = 0;
 virtual void                           destroyVideoSessionParametersKHR                                (VkDevice device, VkVideoSessionParametersKHR videoSessionParameters, const VkAllocationCallbacks* pAllocator) const = 0;
index a42251e..5103c76 100644 (file)
@@ -2,53 +2,53 @@
  * be lost! Modify the generating script instead.
  */
 virtual void           destroyInstance                                                                                                 (VkInstance instance, const VkAllocationCallbacks* pAllocator) const = 0;
-virtual VkResult       enumeratePhysicalDevices                                                                                (VkInstance instance, deUint32* pPhysicalDeviceCount, VkPhysicalDevice* pPhysicalDevices) const = 0;
+virtual VkResult       enumeratePhysicalDevices                                                                                (VkInstance instance, uint32_t* pPhysicalDeviceCount, VkPhysicalDevice* pPhysicalDevices) const = 0;
 virtual void           getPhysicalDeviceFeatures                                                                               (VkPhysicalDevice physicalDevice, VkPhysicalDeviceFeatures* pFeatures) const = 0;
 virtual void           getPhysicalDeviceFormatProperties                                                               (VkPhysicalDevice physicalDevice, VkFormat format, VkFormatProperties* pFormatProperties) const = 0;
 virtual VkResult       getPhysicalDeviceImageFormatProperties                                                  (VkPhysicalDevice physicalDevice, VkFormat format, VkImageType type, VkImageTiling tiling, VkImageUsageFlags usage, VkImageCreateFlags flags, VkImageFormatProperties* pImageFormatProperties) const = 0;
 virtual void           getPhysicalDeviceProperties                                                                             (VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties* pProperties) const = 0;
-virtual void           getPhysicalDeviceQueueFamilyProperties                                                  (VkPhysicalDevice physicalDevice, deUint32* pQueueFamilyPropertyCount, VkQueueFamilyProperties* pQueueFamilyProperties) const = 0;
+virtual void           getPhysicalDeviceQueueFamilyProperties                                                  (VkPhysicalDevice physicalDevice, uint32_t* pQueueFamilyPropertyCount, VkQueueFamilyProperties* pQueueFamilyProperties) const = 0;
 virtual void           getPhysicalDeviceMemoryProperties                                                               (VkPhysicalDevice physicalDevice, VkPhysicalDeviceMemoryProperties* pMemoryProperties) const = 0;
 virtual VkResult       createDevice                                                                                                    (VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkDevice* pDevice) const = 0;
-virtual VkResult       enumerateDeviceExtensionProperties                                                              (VkPhysicalDevice physicalDevice, const char* pLayerName, deUint32* pPropertyCount, VkExtensionProperties* pProperties) const = 0;
-virtual VkResult       enumerateDeviceLayerProperties                                                                  (VkPhysicalDevice physicalDevice, deUint32* pPropertyCount, VkLayerProperties* pProperties) const = 0;
-virtual void           getPhysicalDeviceSparseImageFormatProperties                                    (VkPhysicalDevice physicalDevice, VkFormat format, VkImageType type, VkSampleCountFlagBits samples, VkImageUsageFlags usage, VkImageTiling tiling, deUint32* pPropertyCount, VkSparseImageFormatProperties* pProperties) const = 0;
-virtual VkResult       enumeratePhysicalDeviceGroups                                                                   (VkInstance instance, deUint32* pPhysicalDeviceGroupCount, VkPhysicalDeviceGroupProperties* pPhysicalDeviceGroupProperties) const = 0;
+virtual VkResult       enumerateDeviceExtensionProperties                                                              (VkPhysicalDevice physicalDevice, const char* pLayerName, uint32_t* pPropertyCount, VkExtensionProperties* pProperties) const = 0;
+virtual VkResult       enumerateDeviceLayerProperties                                                                  (VkPhysicalDevice physicalDevice, uint32_t* pPropertyCount, VkLayerProperties* pProperties) const = 0;
+virtual void           getPhysicalDeviceSparseImageFormatProperties                                    (VkPhysicalDevice physicalDevice, VkFormat format, VkImageType type, VkSampleCountFlagBits samples, VkImageUsageFlags usage, VkImageTiling tiling, uint32_t* pPropertyCount, VkSparseImageFormatProperties* pProperties) const = 0;
+virtual VkResult       enumeratePhysicalDeviceGroups                                                                   (VkInstance instance, uint32_t* pPhysicalDeviceGroupCount, VkPhysicalDeviceGroupProperties* pPhysicalDeviceGroupProperties) const = 0;
 virtual void           getPhysicalDeviceFeatures2                                                                              (VkPhysicalDevice physicalDevice, VkPhysicalDeviceFeatures2* pFeatures) const = 0;
 virtual void           getPhysicalDeviceProperties2                                                                    (VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2* pProperties) const = 0;
 virtual void           getPhysicalDeviceFormatProperties2                                                              (VkPhysicalDevice physicalDevice, VkFormat format, VkFormatProperties2* pFormatProperties) const = 0;
 virtual VkResult       getPhysicalDeviceImageFormatProperties2                                                 (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2* pImageFormatInfo, VkImageFormatProperties2* pImageFormatProperties) const = 0;
-virtual void           getPhysicalDeviceQueueFamilyProperties2                                                 (VkPhysicalDevice physicalDevice, deUint32* pQueueFamilyPropertyCount, VkQueueFamilyProperties2* pQueueFamilyProperties) const = 0;
+virtual void           getPhysicalDeviceQueueFamilyProperties2                                                 (VkPhysicalDevice physicalDevice, uint32_t* pQueueFamilyPropertyCount, VkQueueFamilyProperties2* pQueueFamilyProperties) const = 0;
 virtual void           getPhysicalDeviceMemoryProperties2                                                              (VkPhysicalDevice physicalDevice, VkPhysicalDeviceMemoryProperties2* pMemoryProperties) const = 0;
-virtual void           getPhysicalDeviceSparseImageFormatProperties2                                   (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSparseImageFormatInfo2* pFormatInfo, deUint32* pPropertyCount, VkSparseImageFormatProperties2* pProperties) const = 0;
+virtual void           getPhysicalDeviceSparseImageFormatProperties2                                   (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSparseImageFormatInfo2* pFormatInfo, uint32_t* pPropertyCount, VkSparseImageFormatProperties2* pProperties) const = 0;
 virtual void           getPhysicalDeviceExternalBufferProperties                                               (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalBufferInfo* pExternalBufferInfo, VkExternalBufferProperties* pExternalBufferProperties) const = 0;
 virtual void           getPhysicalDeviceExternalFenceProperties                                                (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalFenceInfo* pExternalFenceInfo, VkExternalFenceProperties* pExternalFenceProperties) const = 0;
 virtual void           getPhysicalDeviceExternalSemaphoreProperties                                    (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalSemaphoreInfo* pExternalSemaphoreInfo, VkExternalSemaphoreProperties* pExternalSemaphoreProperties) const = 0;
 virtual void           destroySurfaceKHR                                                                                               (VkInstance instance, VkSurfaceKHR surface, const VkAllocationCallbacks* pAllocator) const = 0;
-virtual VkResult       getPhysicalDeviceSurfaceSupportKHR                                                              (VkPhysicalDevice physicalDevice, deUint32 queueFamilyIndex, VkSurfaceKHR surface, VkBool32* pSupported) const = 0;
+virtual VkResult       getPhysicalDeviceSurfaceSupportKHR                                                              (VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, VkSurfaceKHR surface, VkBool32* pSupported) const = 0;
 virtual VkResult       getPhysicalDeviceSurfaceCapabilitiesKHR                                                 (VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, VkSurfaceCapabilitiesKHR* pSurfaceCapabilities) const = 0;
-virtual VkResult       getPhysicalDeviceSurfaceFormatsKHR                                                              (VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, deUint32* pSurfaceFormatCount, VkSurfaceFormatKHR* pSurfaceFormats) const = 0;
-virtual VkResult       getPhysicalDeviceSurfacePresentModesKHR                                                 (VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, deUint32* pPresentModeCount, VkPresentModeKHR* pPresentModes) const = 0;
-virtual VkResult       getPhysicalDevicePresentRectanglesKHR                                                   (VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, deUint32* pRectCount, VkRect2D* pRects) const = 0;
-virtual VkResult       getPhysicalDeviceDisplayPropertiesKHR                                                   (VkPhysicalDevice physicalDevice, deUint32* pPropertyCount, VkDisplayPropertiesKHR* pProperties) const = 0;
-virtual VkResult       getPhysicalDeviceDisplayPlanePropertiesKHR                                              (VkPhysicalDevice physicalDevice, deUint32* pPropertyCount, VkDisplayPlanePropertiesKHR* pProperties) const = 0;
-virtual VkResult       getDisplayPlaneSupportedDisplaysKHR                                                             (VkPhysicalDevice physicalDevice, deUint32 planeIndex, deUint32* pDisplayCount, VkDisplayKHR* pDisplays) const = 0;
-virtual VkResult       getDisplayModePropertiesKHR                                                                             (VkPhysicalDevice physicalDevice, VkDisplayKHR display, deUint32* pPropertyCount, VkDisplayModePropertiesKHR* pProperties) const = 0;
+virtual VkResult       getPhysicalDeviceSurfaceFormatsKHR                                                              (VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, uint32_t* pSurfaceFormatCount, VkSurfaceFormatKHR* pSurfaceFormats) const = 0;
+virtual VkResult       getPhysicalDeviceSurfacePresentModesKHR                                                 (VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, uint32_t* pPresentModeCount, VkPresentModeKHR* pPresentModes) const = 0;
+virtual VkResult       getPhysicalDevicePresentRectanglesKHR                                                   (VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, uint32_t* pRectCount, VkRect2D* pRects) const = 0;
+virtual VkResult       getPhysicalDeviceDisplayPropertiesKHR                                                   (VkPhysicalDevice physicalDevice, uint32_t* pPropertyCount, VkDisplayPropertiesKHR* pProperties) const = 0;
+virtual VkResult       getPhysicalDeviceDisplayPlanePropertiesKHR                                              (VkPhysicalDevice physicalDevice, uint32_t* pPropertyCount, VkDisplayPlanePropertiesKHR* pProperties) const = 0;
+virtual VkResult       getDisplayPlaneSupportedDisplaysKHR                                                             (VkPhysicalDevice physicalDevice, uint32_t planeIndex, uint32_t* pDisplayCount, VkDisplayKHR* pDisplays) const = 0;
+virtual VkResult       getDisplayModePropertiesKHR                                                                             (VkPhysicalDevice physicalDevice, VkDisplayKHR display, uint32_t* pPropertyCount, VkDisplayModePropertiesKHR* pProperties) const = 0;
 virtual VkResult       createDisplayModeKHR                                                                                    (VkPhysicalDevice physicalDevice, VkDisplayKHR display, const VkDisplayModeCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkDisplayModeKHR* pMode) const = 0;
-virtual VkResult       getDisplayPlaneCapabilitiesKHR                                                                  (VkPhysicalDevice physicalDevice, VkDisplayModeKHR mode, deUint32 planeIndex, VkDisplayPlaneCapabilitiesKHR* pCapabilities) const = 0;
+virtual VkResult       getDisplayPlaneCapabilitiesKHR                                                                  (VkPhysicalDevice physicalDevice, VkDisplayModeKHR mode, uint32_t planeIndex, VkDisplayPlaneCapabilitiesKHR* pCapabilities) const = 0;
 virtual VkResult       createDisplayPlaneSurfaceKHR                                                                    (VkInstance instance, const VkDisplaySurfaceCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface) const = 0;
-virtual VkResult       enumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR   (VkPhysicalDevice physicalDevice, deUint32 queueFamilyIndex, deUint32* pCounterCount, VkPerformanceCounterKHR* pCounters, VkPerformanceCounterDescriptionKHR* pCounterDescriptions) const = 0;
-virtual void           getPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR                   (VkPhysicalDevice physicalDevice, const VkQueryPoolPerformanceCreateInfoKHR* pPerformanceQueryCreateInfo, deUint32* pNumPasses) const = 0;
+virtual VkResult       enumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR   (VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, uint32_t* pCounterCount, VkPerformanceCounterKHR* pCounters, VkPerformanceCounterDescriptionKHR* pCounterDescriptions) const = 0;
+virtual void           getPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR                   (VkPhysicalDevice physicalDevice, const VkQueryPoolPerformanceCreateInfoKHR* pPerformanceQueryCreateInfo, uint32_t* pNumPasses) const = 0;
 virtual VkResult       getPhysicalDeviceSurfaceCapabilities2KHR                                                (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo, VkSurfaceCapabilities2KHR* pSurfaceCapabilities) const = 0;
-virtual VkResult       getPhysicalDeviceSurfaceFormats2KHR                                                             (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo, deUint32* pSurfaceFormatCount, VkSurfaceFormat2KHR* pSurfaceFormats) const = 0;
-virtual VkResult       getPhysicalDeviceDisplayProperties2KHR                                                  (VkPhysicalDevice physicalDevice, deUint32* pPropertyCount, VkDisplayProperties2KHR* pProperties) const = 0;
-virtual VkResult       getPhysicalDeviceDisplayPlaneProperties2KHR                                             (VkPhysicalDevice physicalDevice, deUint32* pPropertyCount, VkDisplayPlaneProperties2KHR* pProperties) const = 0;
-virtual VkResult       getDisplayModeProperties2KHR                                                                    (VkPhysicalDevice physicalDevice, VkDisplayKHR display, deUint32* pPropertyCount, VkDisplayModeProperties2KHR* pProperties) const = 0;
+virtual VkResult       getPhysicalDeviceSurfaceFormats2KHR                                                             (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo, uint32_t* pSurfaceFormatCount, VkSurfaceFormat2KHR* pSurfaceFormats) const = 0;
+virtual VkResult       getPhysicalDeviceDisplayProperties2KHR                                                  (VkPhysicalDevice physicalDevice, uint32_t* pPropertyCount, VkDisplayProperties2KHR* pProperties) const = 0;
+virtual VkResult       getPhysicalDeviceDisplayPlaneProperties2KHR                                             (VkPhysicalDevice physicalDevice, uint32_t* pPropertyCount, VkDisplayPlaneProperties2KHR* pProperties) const = 0;
+virtual VkResult       getDisplayModeProperties2KHR                                                                    (VkPhysicalDevice physicalDevice, VkDisplayKHR display, uint32_t* pPropertyCount, VkDisplayModeProperties2KHR* pProperties) const = 0;
 virtual VkResult       getDisplayPlaneCapabilities2KHR                                                                 (VkPhysicalDevice physicalDevice, const VkDisplayPlaneInfo2KHR* pDisplayPlaneInfo, VkDisplayPlaneCapabilities2KHR* pCapabilities) const = 0;
-virtual VkResult       getPhysicalDeviceFragmentShadingRatesKHR                                                (VkPhysicalDevice physicalDevice, deUint32* pFragmentShadingRateCount, VkPhysicalDeviceFragmentShadingRateKHR* pFragmentShadingRates) const = 0;
+virtual VkResult       getPhysicalDeviceFragmentShadingRatesKHR                                                (VkPhysicalDevice physicalDevice, uint32_t* pFragmentShadingRateCount, VkPhysicalDeviceFragmentShadingRateKHR* pFragmentShadingRates) const = 0;
 virtual VkResult       createDebugReportCallbackEXT                                                                    (VkInstance instance, const VkDebugReportCallbackCreateInfoEXT* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkDebugReportCallbackEXT* pCallback) const = 0;
 virtual void           destroyDebugReportCallbackEXT                                                                   (VkInstance instance, VkDebugReportCallbackEXT callback, const VkAllocationCallbacks* pAllocator) const = 0;
-virtual void           debugReportMessageEXT                                                                                   (VkInstance instance, VkDebugReportFlagsEXT flags, VkDebugReportObjectTypeEXT objectType, deUint64 object, deUintptr location, deInt32 messageCode, const char* pLayerPrefix, const char* pMessage) const = 0;
+virtual void           debugReportMessageEXT                                                                                   (VkInstance instance, VkDebugReportFlagsEXT flags, VkDebugReportObjectTypeEXT objectType, deUint64 object, deUintptr location, int32_t messageCode, const char* pLayerPrefix, const char* pMessage) const = 0;
 virtual VkResult       getPhysicalDeviceExternalImageFormatPropertiesNV                                (VkPhysicalDevice physicalDevice, VkFormat format, VkImageType type, VkImageTiling tiling, VkImageUsageFlags usage, VkImageCreateFlags flags, VkExternalMemoryHandleTypeFlagsNV externalHandleType, VkExternalImageFormatPropertiesNV* pExternalImageFormatProperties) const = 0;
 virtual VkResult       releaseDisplayEXT                                                                                               (VkPhysicalDevice physicalDevice, VkDisplayKHR display) const = 0;
 virtual VkResult       getPhysicalDeviceSurfaceCapabilities2EXT                                                (VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, VkSurfaceCapabilities2EXT* pSurfaceCapabilities) const = 0;
@@ -56,18 +56,18 @@ virtual VkResult    createDebugUtilsMessengerEXT                                                                    (VkInstance instance, cons
 virtual void           destroyDebugUtilsMessengerEXT                                                                   (VkInstance instance, VkDebugUtilsMessengerEXT messenger, const VkAllocationCallbacks* pAllocator) const = 0;
 virtual void           submitDebugUtilsMessageEXT                                                                              (VkInstance instance, VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity, VkDebugUtilsMessageTypeFlagsEXT messageTypes, const VkDebugUtilsMessengerCallbackDataEXT* pCallbackData) const = 0;
 virtual void           getPhysicalDeviceMultisamplePropertiesEXT                                               (VkPhysicalDevice physicalDevice, VkSampleCountFlagBits samples, VkMultisamplePropertiesEXT* pMultisampleProperties) const = 0;
-virtual VkResult       getPhysicalDeviceCalibrateableTimeDomainsEXT                                    (VkPhysicalDevice physicalDevice, deUint32* pTimeDomainCount, VkTimeDomainEXT* pTimeDomains) const = 0;
-virtual VkResult       getPhysicalDeviceToolPropertiesEXT                                                              (VkPhysicalDevice physicalDevice, deUint32* pToolCount, VkPhysicalDeviceToolPropertiesEXT* pToolProperties) const = 0;
-virtual VkResult       getPhysicalDeviceCooperativeMatrixPropertiesNV                                  (VkPhysicalDevice physicalDevice, deUint32* pPropertyCount, VkCooperativeMatrixPropertiesNV* pProperties) const = 0;
-virtual VkResult       getPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV (VkPhysicalDevice physicalDevice, deUint32* pCombinationCount, VkFramebufferMixedSamplesCombinationNV* pCombinations) const = 0;
+virtual VkResult       getPhysicalDeviceCalibrateableTimeDomainsEXT                                    (VkPhysicalDevice physicalDevice, uint32_t* pTimeDomainCount, VkTimeDomainEXT* pTimeDomains) const = 0;
+virtual VkResult       getPhysicalDeviceToolPropertiesEXT                                                              (VkPhysicalDevice physicalDevice, uint32_t* pToolCount, VkPhysicalDeviceToolPropertiesEXT* pToolProperties) const = 0;
+virtual VkResult       getPhysicalDeviceCooperativeMatrixPropertiesNV                                  (VkPhysicalDevice physicalDevice, uint32_t* pPropertyCount, VkCooperativeMatrixPropertiesNV* pProperties) const = 0;
+virtual VkResult       getPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV (VkPhysicalDevice physicalDevice, uint32_t* pCombinationCount, VkFramebufferMixedSamplesCombinationNV* pCombinations) const = 0;
 virtual VkResult       createHeadlessSurfaceEXT                                                                                (VkInstance instance, const VkHeadlessSurfaceCreateInfoEXT* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface) const = 0;
-virtual VkResult       acquireDrmDisplayEXT                                                                                    (VkPhysicalDevice physicalDevice, deInt32 drmFd, VkDisplayKHR display) const = 0;
-virtual VkResult       getDrmDisplayEXT                                                                                                (VkPhysicalDevice physicalDevice, deInt32 drmFd, deUint32 connectorId, VkDisplayKHR* display) const = 0;
+virtual VkResult       acquireDrmDisplayEXT                                                                                    (VkPhysicalDevice physicalDevice, int32_t drmFd, VkDisplayKHR display) const = 0;
+virtual VkResult       getDrmDisplayEXT                                                                                                (VkPhysicalDevice physicalDevice, int32_t drmFd, uint32_t connectorId, VkDisplayKHR* display) const = 0;
 virtual VkResult       acquireWinrtDisplayNV                                                                                   (VkPhysicalDevice physicalDevice, VkDisplayKHR display) const = 0;
-virtual VkResult       getWinrtDisplayNV                                                                                               (VkPhysicalDevice physicalDevice, deUint32 deviceRelativeId, VkDisplayKHR* pDisplay) const = 0;
+virtual VkResult       getWinrtDisplayNV                                                                                               (VkPhysicalDevice physicalDevice, uint32_t deviceRelativeId, VkDisplayKHR* pDisplay) const = 0;
 virtual VkResult       createAndroidSurfaceKHR                                                                                 (VkInstance instance, const VkAndroidSurfaceCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface) const = 0;
 virtual VkResult       getPhysicalDeviceVideoCapabilitiesKHR                                                   (VkPhysicalDevice physicalDevice, const VkVideoProfileKHR* pVideoProfile, VkVideoCapabilitiesKHR* pCapabilities) const = 0;
-virtual VkResult       getPhysicalDeviceVideoFormatPropertiesKHR                                               (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceVideoFormatInfoKHR* pVideoFormatInfo, deUint32* pVideoFormatPropertyCount, VkVideoFormatPropertiesKHR* pVideoFormatProperties) const = 0;
+virtual VkResult       getPhysicalDeviceVideoFormatPropertiesKHR                                               (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceVideoFormatInfoKHR* pVideoFormatInfo, uint32_t* pVideoFormatPropertyCount, VkVideoFormatPropertiesKHR* pVideoFormatProperties) const = 0;
 virtual VkResult       createImagePipeSurfaceFUCHSIA                                                                   (VkInstance instance, const VkImagePipeSurfaceCreateInfoFUCHSIA* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface) const = 0;
 virtual VkResult       createStreamDescriptorSurfaceGGP                                                                (VkInstance instance, const VkStreamDescriptorSurfaceCreateInfoGGP* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface) const = 0;
 virtual VkResult       createIOSSurfaceMVK                                                                                             (VkInstance instance, const VkIOSSurfaceCreateInfoMVK* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface) const = 0;
@@ -75,13 +75,13 @@ virtual VkResult    createMacOSSurfaceMVK                                                                                   (VkInstance instance, const VkM
 virtual VkResult       createMetalSurfaceEXT                                                                                   (VkInstance instance, const VkMetalSurfaceCreateInfoEXT* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface) const = 0;
 virtual VkResult       createViSurfaceNN                                                                                               (VkInstance instance, const VkViSurfaceCreateInfoNN* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface) const = 0;
 virtual VkResult       createWaylandSurfaceKHR                                                                                 (VkInstance instance, const VkWaylandSurfaceCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface) const = 0;
-virtual VkBool32       getPhysicalDeviceWaylandPresentationSupportKHR                                  (VkPhysicalDevice physicalDevice, deUint32 queueFamilyIndex, pt::WaylandDisplayPtr display) const = 0;
+virtual VkBool32       getPhysicalDeviceWaylandPresentationSupportKHR                                  (VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, pt::WaylandDisplayPtr display) const = 0;
 virtual VkResult       createWin32SurfaceKHR                                                                                   (VkInstance instance, const VkWin32SurfaceCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface) const = 0;
-virtual VkBool32       getPhysicalDeviceWin32PresentationSupportKHR                                    (VkPhysicalDevice physicalDevice, deUint32 queueFamilyIndex) const = 0;
-virtual VkResult       getPhysicalDeviceSurfacePresentModes2EXT                                                (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo, deUint32* pPresentModeCount, VkPresentModeKHR* pPresentModes) const = 0;
+virtual VkBool32       getPhysicalDeviceWin32PresentationSupportKHR                                    (VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex) const = 0;
+virtual VkResult       getPhysicalDeviceSurfacePresentModes2EXT                                                (VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo, uint32_t* pPresentModeCount, VkPresentModeKHR* pPresentModes) const = 0;
 virtual VkResult       createXcbSurfaceKHR                                                                                             (VkInstance instance, const VkXcbSurfaceCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface) const = 0;
-virtual VkBool32       getPhysicalDeviceXcbPresentationSupportKHR                                              (VkPhysicalDevice physicalDevice, deUint32 queueFamilyIndex, pt::XcbConnectionPtr connection, pt::XcbVisualid visual_id) const = 0;
+virtual VkBool32       getPhysicalDeviceXcbPresentationSupportKHR                                              (VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, pt::XcbConnectionPtr connection, pt::XcbVisualid visual_id) const = 0;
 virtual VkResult       createXlibSurfaceKHR                                                                                    (VkInstance instance, const VkXlibSurfaceCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface) const = 0;
-virtual VkBool32       getPhysicalDeviceXlibPresentationSupportKHR                                             (VkPhysicalDevice physicalDevice, deUint32 queueFamilyIndex, pt::XlibDisplayPtr dpy, pt::XlibVisualID visualID) const = 0;
+virtual VkBool32       getPhysicalDeviceXlibPresentationSupportKHR                                             (VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, pt::XlibDisplayPtr dpy, pt::XlibVisualID visualID) const = 0;
 virtual VkResult       acquireXlibDisplayEXT                                                                                   (VkPhysicalDevice physicalDevice, pt::XlibDisplayPtr dpy, VkDisplayKHR display) const = 0;
 virtual VkResult       getRandROutputDisplayEXT                                                                                (VkPhysicalDevice physicalDevice, pt::XlibDisplayPtr dpy, pt::RROutput rrOutput, VkDisplayKHR* pDisplay) const = 0;
index 3e71695..cb0130f 100644 (file)
@@ -3,6 +3,6 @@
  */
 virtual VkResult                       createInstance                                                  (const VkInstanceCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkInstance* pInstance) const = 0;
 virtual PFN_vkVoidFunction     getInstanceProcAddr                                             (VkInstance instance, const char* pName) const = 0;
-virtual VkResult                       enumerateInstanceExtensionProperties    (const char* pLayerName, deUint32* pPropertyCount, VkExtensionProperties* pProperties) const = 0;
-virtual VkResult                       enumerateInstanceLayerProperties                (deUint32* pPropertyCount, VkLayerProperties* pProperties) const = 0;
-virtual VkResult                       enumerateInstanceVersion                                (deUint32* pApiVersion) const = 0;
+virtual VkResult                       enumerateInstanceExtensionProperties    (const char* pLayerName, uint32_t* pPropertyCount, VkExtensionProperties* pProperties) const = 0;
+virtual VkResult                       enumerateInstanceLayerProperties                (uint32_t* pPropertyCount, VkLayerProperties* pProperties) const = 0;
+virtual VkResult                       enumerateInstanceVersion                                (uint32_t* pApiVersion) const = 0;
index 2cdbfb9..5c2e681 100755 (executable)
@@ -52,12 +52,12 @@ DEFINITIONS                 = [
        ("VK_MAX_MEMORY_HEAPS",                                 "size_t"),
        ("VK_MAX_DESCRIPTION_SIZE",                             "size_t"),
        ("VK_MAX_DEVICE_GROUP_SIZE",                    "size_t"),
-       ("VK_ATTACHMENT_UNUSED",                                "deUint32"),
-       ("VK_SUBPASS_EXTERNAL",                                 "deUint32"),
-       ("VK_QUEUE_FAMILY_IGNORED",                             "deUint32"),
-       ("VK_QUEUE_FAMILY_EXTERNAL",                    "deUint32"),
-       ("VK_REMAINING_MIP_LEVELS",                             "deUint32"),
-       ("VK_REMAINING_ARRAY_LAYERS",                   "deUint32"),
+       ("VK_ATTACHMENT_UNUSED",                                "uint32_t"),
+       ("VK_SUBPASS_EXTERNAL",                                 "uint32_t"),
+       ("VK_QUEUE_FAMILY_IGNORED",                             "uint32_t"),
+       ("VK_QUEUE_FAMILY_EXTERNAL",                    "uint32_t"),
+       ("VK_REMAINING_MIP_LEVELS",                             "uint32_t"),
+       ("VK_REMAINING_ARRAY_LAYERS",                   "uint32_t"),
        ("VK_WHOLE_SIZE",                                               "vk::VkDeviceSize"),
        ("VK_TRUE",                                                             "vk::VkBool32"),
        ("VK_FALSE",                                                    "vk::VkBool32"),
@@ -67,12 +67,12 @@ PLATFORM_TYPES              = [
        # VK_KHR_xlib_surface
        (["Display","*"],                                               ["XlibDisplayPtr"],                             "void*"),
        (["Window"],                                                    ["XlibWindow"],                                 "deUintptr",),
-       (["VisualID"],                                                  ["XlibVisualID"],                               "deUint32"),
+       (["VisualID"],                                                  ["XlibVisualID"],                               "uint32_t"),
 
        # VK_KHR_xcb_surface
        (["xcb_connection_t", "*"],                             ["XcbConnectionPtr"],                   "void*"),
        (["xcb_window_t"],                                              ["XcbWindow"],                                  "deUintptr"),
-       (["xcb_visualid_t"],                                    ["XcbVisualid"],                                "deUint32"),
+       (["xcb_visualid_t"],                                    ["XcbVisualid"],                                "uint32_t"),
 
        # VK_KHR_wayland_surface
        (["struct", "wl_display","*"],                  ["WaylandDisplayPtr"],                  "void*"),
@@ -97,9 +97,9 @@ PLATFORM_TYPES                = [
        # VK_EXT_acquire_xlib_display
        (["RROutput"],                                                  ["RROutput"],                                   "void*"),
 
-       (["zx_handle_t"],                                               ["zx_handle_t"],                                "deInt32"),
-       (["GgpFrameToken"],                                             ["GgpFrameToken"],                              "deInt32"),
-       (["GgpStreamDescriptor"],                               ["GgpStreamDescriptor"],                "deInt32"),
+       (["zx_handle_t"],                                               ["zx_handle_t"],                                "int32_t"),
+       (["GgpFrameToken"],                                             ["GgpFrameToken"],                              "int32_t"),
+       (["GgpStreamDescriptor"],                               ["GgpStreamDescriptor"],                "int32_t"),
        (["CAMetalLayer"],                                              ["CAMetalLayer"],                               "void*"),
 ]
 
@@ -108,11 +108,9 @@ PLATFORM_TYPE_NAMESPACE    = "pt"
 TYPE_SUBSTITUTIONS             = [
        ("uint8_t",             "deUint8"),
        ("uint16_t",    "deUint16"),
-       ("uint32_t",    "deUint32"),
        ("uint64_t",    "deUint64"),
        ("int8_t",              "deInt8"),
        ("int16_t",             "deInt16"),
-       ("int32_t",             "deInt32"),
        ("int64_t",             "deInt64"),
        ("bool32_t",    "deUint32"),
        ("size_t",              "deUintptr"),
@@ -695,7 +693,7 @@ def parseExtensions (src, versions, allFunctions, allCompositeTypes, allEnums, a
        definitionsByName               = {definition.name: definition for definition in allDefinitions}
 
        for extensionName, extensionSrc in splitSrc:
-               definitions                     = [Definition("deUint32", v.getInHex(), parsePreprocDefinedValueOptional(extensionSrc, v.getInHex())) for v in versions]
+               definitions                     = [Definition("uint32_t", v.getInHex(), parsePreprocDefinedValueOptional(extensionSrc, v.getInHex())) for v in versions]
                definitions.extend([Definition(type, name, parsePreprocDefinedValueOptional(extensionSrc, name)) for name, type in DEFINITIONS])
                definitions                     = [definition for definition in definitions if definition.value != None]
                additionalDefinitions = parseDefinitions(extensionName, extensionSrc)
@@ -750,7 +748,7 @@ def parse64bitBitfieldValues (src, bitfieldNamesList):
 def parseAPI (src):
        versionsData    = parseVersions(src)
        versions                = [Version((v[2], v[3], 0)) for v in versionsData]
-       definitions             = [Definition("deUint32", v.getInHex(), parsePreprocDefinedValue(src, v.getInHex())) for v in versions] +\
+       definitions             = [Definition("uint32_t", v.getInHex(), parsePreprocDefinedValue(src, v.getInHex())) for v in versions] +\
                                          [Definition(type, name, parsePreprocDefinedValue(src, name)) for name, type in DEFINITIONS]
 
        handles                         = parseHandles(src)
@@ -895,7 +893,7 @@ def genBitfieldSrc (bitfield):
                for line in indentLines(["\t%s\t= %s," % v for v in bitfield.values]):
                        yield line
                yield "};"
-       yield "typedef deUint32 %s;" % bitfield.name
+       yield "typedef uint32_t %s;" % bitfield.name
 
 def genBitfield64Src (bitfield64):
        yield "typedef deUint64 %s;" % bitfield64.name
@@ -1527,7 +1525,7 @@ def writeDriverIds(filename):
        driverIdsString.append("static const struct\n"
                                         "{\n"
                                         "\tstd::string driver;\n"
-                                        "\tdeUint32 id;\n"
+                                        "\tuint32_t id;\n"
                                         "} driverIds [] =\n"
                                         "{")
 
@@ -1588,11 +1586,11 @@ def writeSupportedExtenions(api, filename):
 
        lines = addVersionDefines(versionSet) + [
        "",
-       "void getCoreDeviceExtensionsImpl (deUint32 coreVersion, ::std::vector<const char*>&%s)" % (" dst" if len(deviceMap) != 0 else ""),
+       "void getCoreDeviceExtensionsImpl (uint32_t coreVersion, ::std::vector<const char*>&%s)" % (" dst" if len(deviceMap) != 0 else ""),
        "{"] + writeExtensionsForVersions(deviceMap) + [
        "}",
        "",
-       "void getCoreInstanceExtensionsImpl (deUint32 coreVersion, ::std::vector<const char*>&%s)" % (" dst" if len(instanceMap) != 0 else ""),
+       "void getCoreInstanceExtensionsImpl (uint32_t coreVersion, ::std::vector<const char*>&%s)" % (" dst" if len(instanceMap) != 0 else ""),
        "{"] + writeExtensionsForVersions(instanceMap) + [
        "}",
        ""] + removeVersionDefines(versionSet)
@@ -1641,10 +1639,10 @@ def writeExtensionFunctions (api, filename):
                isFirstWrite = True
                dg_list = []    # Device groups functions need special casing, as Vulkan 1.0 keeps them in VK_KHR_device_groups whereas 1.1 moved them into VK_KHR_swapchain
                if functionType == Function.TYPE_INSTANCE:
-                       yield 'void getInstanceExtensionFunctions (deUint32 apiVersion, ::std::string extName, ::std::vector<const char*>& functions)\n{'
+                       yield 'void getInstanceExtensionFunctions (uint32_t apiVersion, ::std::string extName, ::std::vector<const char*>& functions)\n{'
                        dg_list = ["vkGetPhysicalDevicePresentRectanglesKHR"]
                elif functionType == Function.TYPE_DEVICE:
-                       yield 'void getDeviceExtensionFunctions (deUint32 apiVersion, ::std::string extName, ::std::vector<const char*>& functions)\n{'
+                       yield 'void getDeviceExtensionFunctions (uint32_t apiVersion, ::std::string extName, ::std::vector<const char*>& functions)\n{'
                        dg_list = ["vkGetDeviceGroupPresentCapabilitiesKHR", "vkGetDeviceGroupSurfacePresentModesKHR", "vkAcquireNextImage2KHR"]
                for ext in api.extensions:
                        funcNames = []
@@ -1699,12 +1697,12 @@ def writeCoreFunctionalities(api, filename):
        "",
        "typedef ::std::pair<const char*, FunctionOrigin> FunctionInfo;",
        "typedef ::std::vector<FunctionInfo> FunctionInfosList;",
-       "typedef ::std::map<deUint32, FunctionInfosList> ApisMap;",
+       "typedef ::std::map<uint32_t, FunctionInfosList> ApisMap;",
        "",
        "void initApisMap (ApisMap& apis)",
        "{",
        "       apis.clear();"] + [
-       "       apis.insert(::std::pair<deUint32, FunctionInfosList>(" + str(v) + ", FunctionInfosList()));" for v in api.versions] + [
+       "       apis.insert(::std::pair<uint32_t, FunctionInfosList>(" + str(v) + ", FunctionInfosList()));" for v in api.versions] + [
        ""]
 
        apiVersions = []