Use [u]int64_t in the framework
authorAlexander Galazin <alexander.galazin@arm.com>
Fri, 9 Jul 2021 11:23:57 +0000 (13:23 +0200)
committerAlexander Galazin <Alexander.Galazin@arm.com>
Fri, 16 Jul 2021 08:25:33 +0000 (08:25 +0000)
This change replaces deUint64/deInt64 with uint64_t/int64_t
in the framework files

Components: Vulkan

Affects: dEQP-VK.*

VK-GL-CTS issue: 2963

Change-Id: I76b24fbfadbd3fb31c9a20b172c021e0305290c2

12 files changed:
external/vulkancts/framework/vulkan/vkBasicTypes.inl
external/vulkancts/framework/vulkan/vkConcreteDeviceInterface.inl
external/vulkancts/framework/vulkan/vkConcreteInstanceInterface.inl
external/vulkancts/framework/vulkan/vkDeviceDriverImpl.inl
external/vulkancts/framework/vulkan/vkFunctionPointerTypes.inl
external/vulkancts/framework/vulkan/vkInstanceDriverImpl.inl
external/vulkancts/framework/vulkan/vkNullDriverImpl.inl
external/vulkancts/framework/vulkan/vkStructTypes.inl
external/vulkancts/framework/vulkan/vkTypeUtil.inl
external/vulkancts/framework/vulkan/vkVirtualDeviceInterface.inl
external/vulkancts/framework/vulkan/vkVirtualInstanceInterface.inl
external/vulkancts/scripts/gen_framework.py

index 8474ad8..fbeaa4c 100644 (file)
@@ -3869,8 +3869,8 @@ typedef VkCommandPoolTrimFlags VkCommandPoolTrimFlagsKHR;
 
 typedef VkDescriptorUpdateTemplateCreateFlags VkDescriptorUpdateTemplateCreateFlagsKHR;
 
-typedef deUint64 VkPipelineStageFlags2KHR;
-typedef deUint64 VkPipelineStageFlagBits2KHR;
+typedef uint64_t VkPipelineStageFlags2KHR;
+typedef uint64_t VkPipelineStageFlagBits2KHR;
 static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_NONE_KHR                                                                  = 0ULL;
 static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_TOP_OF_PIPE_BIT_KHR                                               = 0x00000001ULL;
 static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_DRAW_INDIRECT_BIT_KHR                                             = 0x00000002ULL;
@@ -3913,8 +3913,8 @@ static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_TASK_SHADER_BIT_NV
 static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_MESH_SHADER_BIT_NV                                                        = 0x00100000ULL;
 static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_SUBPASS_SHADING_BIT_HUAWEI                                        = 0x8000000000ULL;
 
-typedef deUint64 VkAccessFlags2KHR;
-typedef deUint64 VkAccessFlagBits2KHR;
+typedef uint64_t VkAccessFlags2KHR;
+typedef uint64_t VkAccessFlagBits2KHR;
 static const VkAccessFlagBits2KHR VK_ACCESS_2_NONE_KHR                                                                         = 0ULL;
 static const VkAccessFlagBits2KHR VK_ACCESS_2_INDIRECT_COMMAND_READ_BIT_KHR                                    = 0x00000001ULL;
 static const VkAccessFlagBits2KHR VK_ACCESS_2_INDEX_READ_BIT_KHR                                                       = 0x00000002ULL;
index 5ef7ebb..1366523 100644 (file)
@@ -24,7 +24,7 @@ virtual VkResult                      createFence                                                                             (VkDevice device, const VkFenceCreateInf
 virtual void                           destroyFence                                                                    (VkDevice device, VkFence fence, const VkAllocationCallbacks* pAllocator) 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, uint32_t fenceCount, const VkFence* pFences, VkBool32 waitAll, deUint64 timeout) const;
+virtual VkResult                       waitForFences                                                                   (VkDevice device, uint32_t fenceCount, const VkFence* pFences, VkBool32 waitAll, uint64_t 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;
@@ -145,8 +145,8 @@ virtual void                                cmdBeginRenderPass2                                                             (VkCommandBuffer commandBuffer, 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, 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                       getSemaphoreCounterValue                                                (VkDevice device, VkSemaphore semaphore, uint64_t* pValue) const;
+virtual VkResult                       waitSemaphores                                                                  (VkDevice device, const VkSemaphoreWaitInfo* pWaitInfo, uint64_t timeout) const;
 virtual VkResult                       signalSemaphore                                                                 (VkDevice device, const VkSemaphoreSignalInfo* pSignalInfo) const;
 virtual VkDeviceAddress                getBufferDeviceAddress                                                  (VkDevice device, const VkBufferDeviceAddressInfo* pInfo) const;
 virtual uint64_t                       getBufferOpaqueCaptureAddress                                   (VkDevice device, const VkBufferDeviceAddressInfo* pInfo) const;
@@ -154,7 +154,7 @@ virtual uint64_t                    getDeviceMemoryOpaqueCaptureAddress                             (VkDevice device, cons
 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, 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                       acquireNextImageKHR                                                             (VkDevice device, VkSwapchainKHR swapchain, uint64_t 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;
@@ -221,7 +221,7 @@ virtual void                                cmdSetViewportWScalingNV                                                (VkCommandBuffer commandBuffer, ui
 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                       getSwapchainCounterEXT                                                  (VkDevice device, VkSwapchainKHR swapchain, VkSurfaceCounterFlagBitsEXT counter, uint64_t* pCounterValue) const;
 virtual VkResult                       getRefreshCycleDurationGOOGLE                                   (VkDevice device, VkSwapchainKHR swapchain, VkRefreshCycleDurationGOOGLE* pDisplayTimingProperties) 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;
@@ -258,7 +258,7 @@ virtual void                                cmdWriteAccelerationStructuresPropertiesNV              (VkCommandBuffer com
 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, uint32_t marker) const;
-virtual VkResult                       getCalibratedTimestampsEXT                                              (VkDevice device, uint32_t timestampCount, const VkCalibratedTimestampInfoEXT* pTimestampInfos, deUint64* pTimestamps, deUint64* pMaxDeviation) const;
+virtual VkResult                       getCalibratedTimestampsEXT                                              (VkDevice device, uint32_t timestampCount, const VkCalibratedTimestampInfoEXT* pTimestampInfos, uint64_t* pTimestamps, uint64_t* 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;
@@ -297,8 +297,8 @@ virtual VkResult                    createIndirectCommandsLayoutNV                                  (VkDevice device, const Vk
 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;
 virtual void                           destroyPrivateDataSlotEXT                                               (VkDevice device, VkPrivateDataSlotEXT privateDataSlot, const VkAllocationCallbacks* pAllocator) const;
-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 VkResult                       setPrivateDataEXT                                                               (VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlotEXT privateDataSlot, uint64_t data) const;
+virtual void                           getPrivateDataEXT                                                               (VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlotEXT privateDataSlot, uint64_t* pData) const;
 virtual void                           cmdSetFragmentShadingRateEnumNV                                 (VkCommandBuffer commandBuffer, VkFragmentShadingRateNV shadingRate, const VkFragmentShadingRateCombinerOpKHR combinerOps[2]) 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;
index 4f97879..067a0cc 100644 (file)
@@ -48,7 +48,7 @@ virtual VkResult      getDisplayPlaneCapabilities2KHR                                                                 (VkPhysicalDevice physi
 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, int32_t messageCode, const char* pLayerPrefix, const char* pMessage) const;
+virtual void           debugReportMessageEXT                                                                                   (VkInstance instance, VkDebugReportFlagsEXT flags, VkDebugReportObjectTypeEXT objectType, uint64_t 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;
index e596de8..74e0963 100644 (file)
@@ -117,7 +117,7 @@ VkResult DeviceDriver::getFenceStatus (VkDevice device, VkFence fence) const
        return m_vk.getFenceStatus(device, fence);
 }
 
-VkResult DeviceDriver::waitForFences (VkDevice device, uint32_t fenceCount, const VkFence* pFences, VkBool32 waitAll, deUint64 timeout) const
+VkResult DeviceDriver::waitForFences (VkDevice device, uint32_t fenceCount, const VkFence* pFences, VkBool32 waitAll, uint64_t timeout) const
 {
        return m_vk.waitForFences(device, fenceCount, pFences, waitAll, timeout);
 }
@@ -722,12 +722,12 @@ void DeviceDriver::resetQueryPool (VkDevice device, VkQueryPool queryPool, uint3
        m_vk.resetQueryPool(device, queryPool, firstQuery, queryCount);
 }
 
-VkResult DeviceDriver::getSemaphoreCounterValue (VkDevice device, VkSemaphore semaphore, deUint64* pValue) const
+VkResult DeviceDriver::getSemaphoreCounterValue (VkDevice device, VkSemaphore semaphore, uint64_t* pValue) const
 {
        return m_vk.getSemaphoreCounterValue(device, semaphore, pValue);
 }
 
-VkResult DeviceDriver::waitSemaphores (VkDevice device, const VkSemaphoreWaitInfo* pWaitInfo, deUint64 timeout) const
+VkResult DeviceDriver::waitSemaphores (VkDevice device, const VkSemaphoreWaitInfo* pWaitInfo, uint64_t timeout) const
 {
        return m_vk.waitSemaphores(device, pWaitInfo, timeout);
 }
@@ -767,7 +767,7 @@ VkResult DeviceDriver::getSwapchainImagesKHR (VkDevice device, VkSwapchainKHR sw
        return m_vk.getSwapchainImagesKHR(device, swapchain, pSwapchainImageCount, pSwapchainImages);
 }
 
-VkResult DeviceDriver::acquireNextImageKHR (VkDevice device, VkSwapchainKHR swapchain, deUint64 timeout, VkSemaphore semaphore, VkFence fence, uint32_t* pImageIndex) const
+VkResult DeviceDriver::acquireNextImageKHR (VkDevice device, VkSwapchainKHR swapchain, uint64_t timeout, VkSemaphore semaphore, VkFence fence, uint32_t* pImageIndex) const
 {
        return m_vk.acquireNextImageKHR(device, swapchain, timeout, semaphore, fence, pImageIndex);
 }
@@ -1102,7 +1102,7 @@ VkResult DeviceDriver::registerDisplayEventEXT (VkDevice device, VkDisplayKHR di
        return m_vk.registerDisplayEventEXT(device, display, pDisplayEventInfo, pAllocator, pFence);
 }
 
-VkResult DeviceDriver::getSwapchainCounterEXT (VkDevice device, VkSwapchainKHR swapchain, VkSurfaceCounterFlagBitsEXT counter, deUint64* pCounterValue) const
+VkResult DeviceDriver::getSwapchainCounterEXT (VkDevice device, VkSwapchainKHR swapchain, VkSurfaceCounterFlagBitsEXT counter, uint64_t* pCounterValue) const
 {
        return m_vk.getSwapchainCounterEXT(device, swapchain, counter, pCounterValue);
 }
@@ -1287,7 +1287,7 @@ void DeviceDriver::cmdWriteBufferMarkerAMD (VkCommandBuffer commandBuffer, VkPip
        m_vk.cmdWriteBufferMarkerAMD(commandBuffer, pipelineStage, dstBuffer, dstOffset, marker);
 }
 
-VkResult DeviceDriver::getCalibratedTimestampsEXT (VkDevice device, uint32_t timestampCount, const VkCalibratedTimestampInfoEXT* pTimestampInfos, deUint64* pTimestamps, deUint64* pMaxDeviation) const
+VkResult DeviceDriver::getCalibratedTimestampsEXT (VkDevice device, uint32_t timestampCount, const VkCalibratedTimestampInfoEXT* pTimestampInfos, uint64_t* pTimestamps, uint64_t* pMaxDeviation) const
 {
        return m_vk.getCalibratedTimestampsEXT(device, timestampCount, pTimestampInfos, pTimestamps, pMaxDeviation);
 }
@@ -1482,12 +1482,12 @@ void DeviceDriver::destroyPrivateDataSlotEXT (VkDevice device, VkPrivateDataSlot
        m_vk.destroyPrivateDataSlotEXT(device, privateDataSlot, pAllocator);
 }
 
-VkResult DeviceDriver::setPrivateDataEXT (VkDevice device, VkObjectType objectType, deUint64 objectHandle, VkPrivateDataSlotEXT privateDataSlot, deUint64 data) const
+VkResult DeviceDriver::setPrivateDataEXT (VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlotEXT privateDataSlot, uint64_t data) const
 {
        return m_vk.setPrivateDataEXT(device, objectType, objectHandle, privateDataSlot, data);
 }
 
-void DeviceDriver::getPrivateDataEXT (VkDevice device, VkObjectType objectType, deUint64 objectHandle, VkPrivateDataSlotEXT privateDataSlot, deUint64* pData) const
+void DeviceDriver::getPrivateDataEXT (VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlotEXT privateDataSlot, uint64_t* pData) const
 {
        m_vk.getPrivateDataEXT(device, objectType, objectHandle, privateDataSlot, pData);
 }
index 16e4304..8827eb7 100644 (file)
@@ -40,7 +40,7 @@ typedef VKAPI_ATTR VkResult                           (VKAPI_CALL* CreateFenceFunc)                                                                                                           (VkDev
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* DestroyFenceFunc)                                                                                                          (VkDevice device, VkFence fence, const VkAllocationCallbacks* pAllocator);
 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, uint32_t 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, uint64_t 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);
@@ -173,8 +173,8 @@ typedef VKAPI_ATTR void                                     (VKAPI_CALL* CmdBeginRenderPass2Func)                                                                                           (Vk
 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, 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* GetSemaphoreCounterValueFunc)                                                                                      (VkDevice device, VkSemaphore semaphore, uint64_t* pValue);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* WaitSemaphoresFunc)                                                                                                        (VkDevice device, const VkSemaphoreWaitInfo* pWaitInfo, uint64_t timeout);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* SignalSemaphoreFunc)                                                                                                       (VkDevice device, const VkSemaphoreSignalInfo* pSignalInfo);
 typedef VKAPI_ATTR VkDeviceAddress             (VKAPI_CALL* GetBufferDeviceAddressFunc)                                                                                        (VkDevice device, const VkBufferDeviceAddressInfo* pInfo);
 typedef VKAPI_ATTR uint64_t                            (VKAPI_CALL* GetBufferOpaqueCaptureAddressFunc)                                                                         (VkDevice device, const VkBufferDeviceAddressInfo* pInfo);
@@ -187,7 +187,7 @@ typedef VKAPI_ATTR VkResult                         (VKAPI_CALL* GetPhysicalDeviceSurfacePresentModes
 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, 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* AcquireNextImageKHRFunc)                                                                                           (VkDevice device, VkSwapchainKHR swapchain, uint64_t 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);
@@ -252,8 +252,8 @@ typedef VKAPI_ATTR VkResult                         (VKAPI_CALL* BindImageMemory2KHRFunc)
 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, 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* GetSemaphoreCounterValueKHRFunc)                                                                           (VkDevice device, VkSemaphore semaphore, uint64_t* pValue);
+typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* WaitSemaphoresKHRFunc)                                                                                                     (VkDevice device, const VkSemaphoreWaitInfo* pWaitInfo, uint64_t timeout);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* SignalSemaphoreKHRFunc)                                                                                            (VkDevice device, const VkSemaphoreSignalInfo* pSignalInfo);
 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]);
@@ -284,7 +284,7 @@ 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, int32_t messageCode, const char* pLayerPrefix, const char* pMessage);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* DebugReportMessageEXTFunc)                                                                                         (VkInstance instance, VkDebugReportFlagsEXT flags, VkDebugReportObjectTypeEXT objectType, uint64_t 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);
@@ -315,7 +315,7 @@ typedef VKAPI_ATTR VkResult                         (VKAPI_CALL* GetPhysicalDeviceSurfaceCapabilities
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* DisplayPowerControlEXTFunc)                                                                                        (VkDevice device, VkDisplayKHR display, const VkDisplayPowerInfoEXT* pDisplayPowerInfo);
 typedef VKAPI_ATTR VkResult                            (VKAPI_CALL* RegisterDeviceEventEXTFunc)                                                                                        (VkDevice device, const VkDeviceEventInfoEXT* pDeviceEventInfo, const VkAllocationCallbacks* pAllocator, VkFence* pFence);
 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* GetSwapchainCounterEXTFunc)                                                                                        (VkDevice device, VkSwapchainKHR swapchain, VkSurfaceCounterFlagBitsEXT counter, uint64_t* 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, uint32_t* pPresentationTimingCount, VkPastPresentationTimingGOOGLE* pPresentationTimings);
 typedef VKAPI_ATTR void                                        (VKAPI_CALL* CmdSetDiscardRectangleEXTFunc)                                                                                     (VkCommandBuffer commandBuffer, uint32_t firstDiscardRectangle, uint32_t discardRectangleCount, const VkRect2D* pDiscardRectangles);
@@ -357,7 +357,7 @@ typedef VKAPI_ATTR VkResult                         (VKAPI_CALL* CompileDeferredNVFunc)                                                                                                     (
 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, 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 VkResult                            (VKAPI_CALL* GetCalibratedTimestampsEXTFunc)                                                                            (VkDevice device, uint32_t timestampCount, const VkCalibratedTimestampInfoEXT* pTimestampInfos, uint64_t* pTimestamps, uint64_t* 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);
@@ -403,8 +403,8 @@ typedef VKAPI_ATTR VkResult                         (VKAPI_CALL* AcquireDrmDisplayEXTFunc)
 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 VkResult                            (VKAPI_CALL* SetPrivateDataEXTFunc)                                                                                                     (VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlotEXT privateDataSlot, uint64_t data);
+typedef VKAPI_ATTR void                                        (VKAPI_CALL* GetPrivateDataEXTFunc)                                                                                                     (VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlotEXT privateDataSlot, uint64_t* 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, uint32_t deviceRelativeId, VkDisplayKHR* pDisplay);
index cd33287..15e10ea 100644 (file)
@@ -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, int32_t messageCode, const char* pLayerPrefix, const char* pMessage) const
+void InstanceDriver::debugReportMessageEXT (VkInstance instance, VkDebugReportFlagsEXT flags, VkDebugReportObjectTypeEXT objectType, uint64_t object, deUintptr location, int32_t messageCode, const char* pLayerPrefix, const char* pMessage) const
 {
        m_vk.debugReportMessageEXT(instance, flags, objectType, object, location, messageCode, pLayerPrefix, pMessage);
 }
index 0f1a631..bbc85f0 100644 (file)
@@ -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, uint32_t fenceCount, const VkFence* pFences, VkBool32 waitAll, deUint64 timeout)
+VKAPI_ATTR VkResult VKAPI_CALL waitForFences (VkDevice device, uint32_t fenceCount, const VkFence* pFences, VkBool32 waitAll, uint64_t timeout)
 {
        DE_UNREF(device);
        DE_UNREF(fenceCount);
@@ -1353,7 +1353,7 @@ VKAPI_ATTR void VKAPI_CALL resetQueryPool (VkDevice device, VkQueryPool queryPoo
        DE_UNREF(queryCount);
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL getSemaphoreCounterValue (VkDevice device, VkSemaphore semaphore, deUint64* pValue)
+VKAPI_ATTR VkResult VKAPI_CALL getSemaphoreCounterValue (VkDevice device, VkSemaphore semaphore, uint64_t* pValue)
 {
        DE_UNREF(device);
        DE_UNREF(semaphore);
@@ -1361,7 +1361,7 @@ VKAPI_ATTR VkResult VKAPI_CALL getSemaphoreCounterValue (VkDevice device, VkSema
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL waitSemaphores (VkDevice device, const VkSemaphoreWaitInfo* pWaitInfo, deUint64 timeout)
+VKAPI_ATTR VkResult VKAPI_CALL waitSemaphores (VkDevice device, const VkSemaphoreWaitInfo* pWaitInfo, uint64_t timeout)
 {
        DE_UNREF(device);
        DE_UNREF(pWaitInfo);
@@ -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, uint32_t* pImageIndex)
+VKAPI_ATTR VkResult VKAPI_CALL acquireNextImageKHR (VkDevice device, VkSwapchainKHR swapchain, uint64_t timeout, VkSemaphore semaphore, VkFence fence, uint32_t* pImageIndex)
 {
        DE_UNREF(device);
        DE_UNREF(swapchain);
@@ -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, int32_t messageCode, const char* pLayerPrefix, const char* pMessage)
+VKAPI_ATTR void VKAPI_CALL debugReportMessageEXT (VkInstance instance, VkDebugReportFlagsEXT flags, VkDebugReportObjectTypeEXT objectType, uint64_t object, deUintptr location, int32_t messageCode, const char* pLayerPrefix, const char* pMessage)
 {
        DE_UNREF(instance);
        DE_UNREF(flags);
@@ -2073,7 +2073,7 @@ VKAPI_ATTR VkResult VKAPI_CALL registerDisplayEventEXT (VkDevice device, VkDispl
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL getSwapchainCounterEXT (VkDevice device, VkSwapchainKHR swapchain, VkSurfaceCounterFlagBitsEXT counter, deUint64* pCounterValue)
+VKAPI_ATTR VkResult VKAPI_CALL getSwapchainCounterEXT (VkDevice device, VkSwapchainKHR swapchain, VkSurfaceCounterFlagBitsEXT counter, uint64_t* pCounterValue)
 {
        DE_UNREF(device);
        DE_UNREF(swapchain);
@@ -2363,7 +2363,7 @@ VKAPI_ATTR VkResult VKAPI_CALL getPhysicalDeviceCalibrateableTimeDomainsEXT (VkP
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL getCalibratedTimestampsEXT (VkDevice device, uint32_t timestampCount, const VkCalibratedTimestampInfoEXT* pTimestampInfos, deUint64* pTimestamps, deUint64* pMaxDeviation)
+VKAPI_ATTR VkResult VKAPI_CALL getCalibratedTimestampsEXT (VkDevice device, uint32_t timestampCount, const VkCalibratedTimestampInfoEXT* pTimestampInfos, uint64_t* pTimestamps, uint64_t* pMaxDeviation)
 {
        DE_UNREF(device);
        DE_UNREF(timestampCount);
@@ -2657,7 +2657,7 @@ VKAPI_ATTR VkResult VKAPI_CALL getDrmDisplayEXT (VkPhysicalDevice physicalDevice
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL setPrivateDataEXT (VkDevice device, VkObjectType objectType, deUint64 objectHandle, VkPrivateDataSlotEXT privateDataSlot, deUint64 data)
+VKAPI_ATTR VkResult VKAPI_CALL setPrivateDataEXT (VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlotEXT privateDataSlot, uint64_t data)
 {
        DE_UNREF(device);
        DE_UNREF(objectType);
@@ -2667,7 +2667,7 @@ VKAPI_ATTR VkResult VKAPI_CALL setPrivateDataEXT (VkDevice device, VkObjectType
        return VK_SUCCESS;
 }
 
-VKAPI_ATTR void VKAPI_CALL getPrivateDataEXT (VkDevice device, VkObjectType objectType, deUint64 objectHandle, VkPrivateDataSlotEXT privateDataSlot, deUint64* pData)
+VKAPI_ATTR void VKAPI_CALL getPrivateDataEXT (VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlotEXT privateDataSlot, uint64_t* pData)
 {
        DE_UNREF(device);
        DE_UNREF(objectType);
index 94d6d28..491cbb5 100644 (file)
@@ -1910,7 +1910,7 @@ struct VkPhysicalDeviceVulkan12Properties
        VkBool32                                                        independentResolve;
        VkBool32                                                        filterMinmaxSingleComponentFormats;
        VkBool32                                                        filterMinmaxImageComponentMapping;
-       deUint64                                                        maxTimelineSemaphoreValueDifference;
+       uint64_t                                                        maxTimelineSemaphoreValueDifference;
        VkSampleCountFlags                                      framebufferIntegerColorSampleCounts;
 };
 
@@ -2288,7 +2288,7 @@ struct VkPhysicalDeviceTimelineSemaphoreProperties
 {
        VkStructureType sType;
        void*                   pNext;
-       deUint64                maxTimelineSemaphoreValueDifference;
+       uint64_t                maxTimelineSemaphoreValueDifference;
 };
 
 struct VkSemaphoreTypeCreateInfo
@@ -2296,7 +2296,7 @@ struct VkSemaphoreTypeCreateInfo
        VkStructureType sType;
        const void*             pNext;
        VkSemaphoreType semaphoreType;
-       deUint64                initialValue;
+       uint64_t                initialValue;
 };
 
 struct VkTimelineSemaphoreSubmitInfo
@@ -2304,9 +2304,9 @@ struct VkTimelineSemaphoreSubmitInfo
        VkStructureType sType;
        const void*             pNext;
        uint32_t                waitSemaphoreValueCount;
-       const deUint64* pWaitSemaphoreValues;
+       const uint64_t* pWaitSemaphoreValues;
        uint32_t                signalSemaphoreValueCount;
-       const deUint64* pSignalSemaphoreValues;
+       const uint64_t* pSignalSemaphoreValues;
 };
 
 struct VkSemaphoreWaitInfo
@@ -2316,7 +2316,7 @@ struct VkSemaphoreWaitInfo
        VkSemaphoreWaitFlags    flags;
        uint32_t                                semaphoreCount;
        const VkSemaphore*              pSemaphores;
-       const deUint64*                 pValues;
+       const uint64_t*                 pValues;
 };
 
 struct VkSemaphoreSignalInfo
@@ -2324,7 +2324,7 @@ struct VkSemaphoreSignalInfo
        VkStructureType sType;
        const void*             pNext;
        VkSemaphore             semaphore;
-       deUint64                value;
+       uint64_t                value;
 };
 
 struct VkPhysicalDeviceBufferDeviceAddressFeatures
@@ -2347,14 +2347,14 @@ struct VkBufferOpaqueCaptureAddressCreateInfo
 {
        VkStructureType sType;
        const void*             pNext;
-       deUint64                opaqueCaptureAddress;
+       uint64_t                opaqueCaptureAddress;
 };
 
 struct VkMemoryOpaqueCaptureAddressAllocateInfo
 {
        VkStructureType sType;
        const void*             pNext;
-       deUint64                opaqueCaptureAddress;
+       uint64_t                opaqueCaptureAddress;
 };
 
 struct VkDeviceMemoryOpaqueCaptureAddressInfo
@@ -2438,7 +2438,7 @@ struct VkAcquireNextImageInfoKHR
        VkStructureType sType;
        const void*             pNext;
        VkSwapchainKHR  swapchain;
-       deUint64                timeout;
+       uint64_t                timeout;
        VkSemaphore             semaphore;
        VkFence                 fence;
        uint32_t                deviceMask;
@@ -2682,9 +2682,9 @@ struct VkQueryPoolPerformanceCreateInfoKHR
 union VkPerformanceCounterResultKHR
 {
        int32_t         int32;
-       deInt64         int64;
+       int64_t         int64;
        uint32_t        uint32;
-       deUint64        uint64;
+       uint64_t        uint64;
        float           float32;
        double          float64;
 };
@@ -2694,7 +2694,7 @@ struct VkAcquireProfilingLockInfoKHR
        VkStructureType                                 sType;
        const void*                                             pNext;
        VkAcquireProfilingLockFlagsKHR  flags;
-       deUint64                                                timeout;
+       uint64_t                                                timeout;
 };
 
 struct VkPerformanceQuerySubmitInfoKHR
@@ -2874,8 +2874,8 @@ struct VkPipelineExecutableInfoKHR
 union VkPipelineExecutableStatisticValueKHR
 {
        VkBool32        b32;
-       deInt64         i64;
-       deUint64        u64;
+       int64_t         i64;
+       uint64_t        u64;
        double          f64;
 };
 
@@ -2967,7 +2967,7 @@ struct VkSemaphoreSubmitInfoKHR
        VkStructureType                         sType;
        const void*                                     pNext;
        VkSemaphore                                     semaphore;
-       deUint64                                        value;
+       uint64_t                                        value;
        VkPipelineStageFlags2KHR        stageMask;
        uint32_t                                        deviceIndex;
 };
@@ -3182,7 +3182,7 @@ struct VkDebugMarkerObjectNameInfoEXT
        VkStructureType                         sType;
        const void*                                     pNext;
        VkDebugReportObjectTypeEXT      objectType;
-       deUint64                                        object;
+       uint64_t                                        object;
        const char*                                     pObjectName;
 };
 
@@ -3191,8 +3191,8 @@ struct VkDebugMarkerObjectTagInfoEXT
        VkStructureType                         sType;
        const void*                                     pNext;
        VkDebugReportObjectTypeEXT      objectType;
-       deUint64                                        object;
-       deUint64                                        tagName;
+       uint64_t                                        object;
+       uint64_t                                        tagName;
        deUintptr                                       tagSize;
        const void*                                     pTag;
 };
@@ -3481,22 +3481,22 @@ struct VkSwapchainCounterCreateInfoEXT
 
 struct VkRefreshCycleDurationGOOGLE
 {
-       deUint64        refreshDuration;
+       uint64_t        refreshDuration;
 };
 
 struct VkPastPresentationTimingGOOGLE
 {
        uint32_t        presentID;
-       deUint64        desiredPresentTime;
-       deUint64        actualPresentTime;
-       deUint64        earliestPresentTime;
-       deUint64        presentMargin;
+       uint64_t        desiredPresentTime;
+       uint64_t        actualPresentTime;
+       uint64_t        earliestPresentTime;
+       uint64_t        presentMargin;
 };
 
 struct VkPresentTimeGOOGLE
 {
        uint32_t        presentID;
-       deUint64        desiredPresentTime;
+       uint64_t        desiredPresentTime;
 };
 
 struct VkPresentTimesInfoGOOGLE
@@ -3620,7 +3620,7 @@ struct VkDebugUtilsObjectNameInfoEXT
        VkStructureType sType;
        const void*             pNext;
        VkObjectType    objectType;
-       deUint64                objectHandle;
+       uint64_t                objectHandle;
        const char*             pObjectName;
 };
 
@@ -3656,8 +3656,8 @@ struct VkDebugUtilsObjectTagInfoEXT
        VkStructureType sType;
        const void*             pNext;
        VkObjectType    objectType;
-       deUint64                objectHandle;
-       deUint64                tagName;
+       uint64_t                objectHandle;
+       uint64_t                tagName;
        deUintptr               tagSize;
        const void*             pTag;
 };
@@ -3825,7 +3825,7 @@ struct VkPhysicalDeviceShaderSMBuiltinsFeaturesNV
 
 struct VkDrmFormatModifierPropertiesEXT
 {
-       deUint64                                drmFormatModifier;
+       uint64_t                                drmFormatModifier;
        uint32_t                                drmFormatModifierPlaneCount;
        VkFormatFeatureFlags    drmFormatModifierTilingFeatures;
 };
@@ -3842,7 +3842,7 @@ struct VkPhysicalDeviceImageDrmFormatModifierInfoEXT
 {
        VkStructureType sType;
        const void*             pNext;
-       deUint64                drmFormatModifier;
+       uint64_t                drmFormatModifier;
        VkSharingMode   sharingMode;
        uint32_t                queueFamilyIndexCount;
        const uint32_t* pQueueFamilyIndices;
@@ -3853,14 +3853,14 @@ struct VkImageDrmFormatModifierListCreateInfoEXT
        VkStructureType sType;
        const void*             pNext;
        uint32_t                drmFormatModifierCount;
-       const deUint64* pDrmFormatModifiers;
+       const uint64_t* pDrmFormatModifiers;
 };
 
 struct VkImageDrmFormatModifierExplicitCreateInfoEXT
 {
        VkStructureType                         sType;
        const void*                                     pNext;
-       deUint64                                        drmFormatModifier;
+       uint64_t                                        drmFormatModifier;
        uint32_t                                        drmFormatModifierPlaneCount;
        const VkSubresourceLayout*      pPlaneLayouts;
 };
@@ -3869,7 +3869,7 @@ struct VkImageDrmFormatModifierPropertiesEXT
 {
        VkStructureType sType;
        void*                   pNext;
-       deUint64                drmFormatModifier;
+       uint64_t                drmFormatModifier;
 };
 
 struct VkValidationCacheCreateInfoEXT
@@ -4066,9 +4066,9 @@ struct VkPhysicalDeviceRayTracingPropertiesNV
        uint32_t                maxRecursionDepth;
        uint32_t                maxShaderGroupStride;
        uint32_t                shaderGroupBaseAlignment;
-       deUint64                maxGeometryCount;
-       deUint64                maxInstanceCount;
-       deUint64                maxTriangleCount;
+       uint64_t                maxGeometryCount;
+       uint64_t                maxInstanceCount;
+       uint64_t                maxTriangleCount;
        uint32_t                maxDescriptorSetAccelerationStructures;
 };
 
@@ -4094,7 +4094,7 @@ struct VkAccelerationStructureInstanceKHR
        uint32_t                                        mask:8;
        uint32_t                                        instanceShaderBindingTableRecordOffset:24;
        VkGeometryInstanceFlagsKHR      flags:8;
-       deUint64                                        accelerationStructureReference;
+       uint64_t                                        accelerationStructureReference;
 };
 
 struct VkPhysicalDeviceRepresentativeFragmentTestFeaturesNV
@@ -4228,7 +4228,7 @@ struct VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT
 struct VkPipelineCreationFeedbackEXT
 {
        VkPipelineCreationFeedbackFlagsEXT      flags;
-       deUint64                                                        duration;
+       uint64_t                                                        duration;
 };
 
 struct VkPipelineCreationFeedbackCreateInfoEXT
@@ -4335,7 +4335,7 @@ struct VkPhysicalDeviceShaderIntegerFunctions2FeaturesINTEL
 union VkPerformanceValueDataINTEL
 {
        uint32_t        value32;
-       deUint64        value64;
+       uint64_t        value64;
        float           valueFloat;
        VkBool32        valueBool;
        const char*     valueString;
@@ -4365,7 +4365,7 @@ struct VkPerformanceMarkerInfoINTEL
 {
        VkStructureType sType;
        const void*             pNext;
-       deUint64                marker;
+       uint64_t                marker;
 };
 
 struct VkPerformanceStreamMarkerInfoINTEL
@@ -4381,7 +4381,7 @@ struct VkPerformanceOverrideInfoINTEL
        const void*                                             pNext;
        VkPerformanceOverrideTypeINTEL  type;
        VkBool32                                                enable;
-       deUint64                                                parameter;
+       uint64_t                                                parameter;
 };
 
 struct VkPerformanceConfigurationAcquireInfoINTEL
@@ -4915,10 +4915,10 @@ struct VkDeviceMemoryReportCallbackDataEXT
        void*                                                           pNext;
        VkDeviceMemoryReportFlagsEXT            flags;
        VkDeviceMemoryReportEventTypeEXT        type;
-       deUint64                                                        memoryObjectId;
+       uint64_t                                                        memoryObjectId;
        VkDeviceSize                                            size;
        VkObjectType                                            objectType;
-       deUint64                                                        objectHandle;
+       uint64_t                                                        objectHandle;
        uint32_t                                                        heapIndex;
 };
 
@@ -5067,7 +5067,7 @@ struct VkAccelerationStructureMatrixMotionInstanceNV
        uint32_t                                        mask:8;
        uint32_t                                        instanceShaderBindingTableRecordOffset:24;
        VkGeometryInstanceFlagsKHR      flags:8;
-       deUint64                                        accelerationStructureReference;
+       uint64_t                                        accelerationStructureReference;
 };
 
 struct VkSRTDataNV
@@ -5098,7 +5098,7 @@ struct VkAccelerationStructureSRTMotionInstanceNV
        uint32_t                                        mask:8;
        uint32_t                                        instanceShaderBindingTableRecordOffset:24;
        VkGeometryInstanceFlagsKHR      flags:8;
-       deUint64                                        accelerationStructureReference;
+       uint64_t                                        accelerationStructureReference;
 };
 
 union VkAccelerationStructureMotionInstanceDataNV
@@ -5223,10 +5223,10 @@ struct VkPhysicalDeviceDrmPropertiesEXT
        void*                   pNext;
        VkBool32                hasPrimary;
        VkBool32                hasRender;
-       deInt64                 primaryMajor;
-       deInt64                 primaryMinor;
-       deInt64                 renderMajor;
-       deInt64                 renderMinor;
+       int64_t                 primaryMajor;
+       int64_t                 primaryMinor;
+       int64_t                 renderMajor;
+       int64_t                 renderMinor;
 };
 
 struct VkSubpassShadingPipelineCreateInfoHUAWEI
@@ -5441,9 +5441,9 @@ struct VkPhysicalDeviceAccelerationStructurePropertiesKHR
 {
        VkStructureType sType;
        void*                   pNext;
-       deUint64                maxGeometryCount;
-       deUint64                maxInstanceCount;
-       deUint64                maxPrimitiveCount;
+       uint64_t                maxGeometryCount;
+       uint64_t                maxInstanceCount;
+       uint64_t                maxPrimitiveCount;
        uint32_t                maxPerStageDescriptorAccelerationStructures;
        uint32_t                maxPerStageDescriptorUpdateAfterBindAccelerationStructures;
        uint32_t                maxDescriptorSetAccelerationStructures;
@@ -5597,7 +5597,7 @@ struct VkAndroidHardwareBufferUsageANDROID
 {
        VkStructureType sType;
        void*                   pNext;
-       deUint64                androidHardwareBufferUsage;
+       uint64_t                androidHardwareBufferUsage;
 };
 
 struct VkAndroidHardwareBufferPropertiesANDROID
@@ -5613,7 +5613,7 @@ struct VkAndroidHardwareBufferFormatPropertiesANDROID
        VkStructureType                                 sType;
        void*                                                   pNext;
        VkFormat                                                format;
-       deUint64                                                externalFormat;
+       uint64_t                                                externalFormat;
        VkFormatFeatureFlags                    formatFeatures;
        VkComponentMapping                              samplerYcbcrConversionComponents;
        VkSamplerYcbcrModelConversion   suggestedYcbcrModel;
@@ -5640,7 +5640,7 @@ struct VkExternalFormatANDROID
 {
        VkStructureType sType;
        void*                   pNext;
-       deUint64                externalFormat;
+       uint64_t                externalFormat;
 };
 
 struct VkVideoQueueFamilyProperties2KHR
@@ -6819,11 +6819,11 @@ struct VkWin32KeyedMutexAcquireReleaseInfoKHR
        const void*                             pNext;
        uint32_t                                acquireCount;
        const VkDeviceMemory*   pAcquireSyncs;
-       const deUint64*                 pAcquireKeys;
+       const uint64_t*                 pAcquireKeys;
        const uint32_t*                 pAcquireTimeouts;
        uint32_t                                releaseCount;
        const VkDeviceMemory*   pReleaseSyncs;
-       const deUint64*                 pReleaseKeys;
+       const uint64_t*                 pReleaseKeys;
 };
 
 struct VkImportSemaphoreWin32HandleInfoKHR
@@ -6851,9 +6851,9 @@ struct VkD3D12FenceSubmitInfoKHR
        VkStructureType sType;
        const void*             pNext;
        uint32_t                waitSemaphoreValuesCount;
-       const deUint64* pWaitSemaphoreValues;
+       const uint64_t* pWaitSemaphoreValues;
        uint32_t                signalSemaphoreValuesCount;
-       const deUint64* pSignalSemaphoreValues;
+       const uint64_t* pSignalSemaphoreValues;
 };
 
 struct VkSemaphoreGetWin32HandleInfoKHR
@@ -6914,11 +6914,11 @@ struct VkWin32KeyedMutexAcquireReleaseInfoNV
        const void*                             pNext;
        uint32_t                                acquireCount;
        const VkDeviceMemory*   pAcquireSyncs;
-       const deUint64*                 pAcquireKeys;
+       const uint64_t*                 pAcquireKeys;
        const uint32_t*                 pAcquireTimeoutMilliseconds;
        uint32_t                                releaseCount;
        const VkDeviceMemory*   pReleaseSyncs;
-       const deUint64*                 pReleaseKeys;
+       const uint64_t*                 pReleaseKeys;
 };
 
 struct VkSurfaceFullScreenExclusiveInfoEXT
index c91bb60..9aaa7d3 100644 (file)
@@ -451,14 +451,14 @@ inline VkViewportWScalingNV makeViewportWScalingNV (float xcoeff, float ycoeff)
        return res;
 }
 
-inline VkRefreshCycleDurationGOOGLE makeRefreshCycleDurationGOOGLE (deUint64 refreshDuration)
+inline VkRefreshCycleDurationGOOGLE makeRefreshCycleDurationGOOGLE (uint64_t refreshDuration)
 {
        VkRefreshCycleDurationGOOGLE res;
        res.refreshDuration     = refreshDuration;
        return res;
 }
 
-inline VkPastPresentationTimingGOOGLE makePastPresentationTimingGOOGLE (uint32_t presentID, deUint64 desiredPresentTime, deUint64 actualPresentTime, deUint64 earliestPresentTime, deUint64 presentMargin)
+inline VkPastPresentationTimingGOOGLE makePastPresentationTimingGOOGLE (uint32_t presentID, uint64_t desiredPresentTime, uint64_t actualPresentTime, uint64_t earliestPresentTime, uint64_t presentMargin)
 {
        VkPastPresentationTimingGOOGLE res;
        res.presentID                   = presentID;
@@ -469,7 +469,7 @@ inline VkPastPresentationTimingGOOGLE makePastPresentationTimingGOOGLE (uint32_t
        return res;
 }
 
-inline VkPresentTimeGOOGLE makePresentTimeGOOGLE (uint32_t presentID, deUint64 desiredPresentTime)
+inline VkPresentTimeGOOGLE makePresentTimeGOOGLE (uint32_t presentID, uint64_t desiredPresentTime)
 {
        VkPresentTimeGOOGLE res;
        res.presentID                   = presentID;
@@ -503,7 +503,7 @@ inline VkSampleLocationEXT makeSampleLocationEXT (float x, float y)
        return res;
 }
 
-inline VkDrmFormatModifierPropertiesEXT makeDrmFormatModifierPropertiesEXT (deUint64 drmFormatModifier, uint32_t drmFormatModifierPlaneCount, VkFormatFeatureFlags drmFormatModifierTilingFeatures)
+inline VkDrmFormatModifierPropertiesEXT makeDrmFormatModifierPropertiesEXT (uint64_t drmFormatModifier, uint32_t drmFormatModifierPlaneCount, VkFormatFeatureFlags drmFormatModifierTilingFeatures)
 {
        VkDrmFormatModifierPropertiesEXT res;
        res.drmFormatModifier                           = drmFormatModifier;
@@ -559,7 +559,7 @@ inline VkVertexInputBindingDivisorDescriptionEXT makeVertexInputBindingDivisorDe
        return res;
 }
 
-inline VkPipelineCreationFeedbackEXT makePipelineCreationFeedbackEXT (VkPipelineCreationFeedbackFlagsEXT flags, deUint64 duration)
+inline VkPipelineCreationFeedbackEXT makePipelineCreationFeedbackEXT (VkPipelineCreationFeedbackFlagsEXT flags, uint64_t duration)
 {
        VkPipelineCreationFeedbackEXT res;
        res.flags               = flags;
index 5ccc9ce..36867fb 100644 (file)
@@ -24,7 +24,7 @@ virtual VkResult                      createFence                                                                             (VkDevice device, const VkFenceCreateInf
 virtual void                           destroyFence                                                                    (VkDevice device, VkFence fence, const VkAllocationCallbacks* pAllocator) 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, uint32_t fenceCount, const VkFence* pFences, VkBool32 waitAll, deUint64 timeout) const = 0;
+virtual VkResult                       waitForFences                                                                   (VkDevice device, uint32_t fenceCount, const VkFence* pFences, VkBool32 waitAll, uint64_t 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;
@@ -145,8 +145,8 @@ virtual void                                cmdBeginRenderPass2                                                             (VkCommandBuffer commandBuffer, const
 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, 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                       getSemaphoreCounterValue                                                (VkDevice device, VkSemaphore semaphore, uint64_t* pValue) const = 0;
+virtual VkResult                       waitSemaphores                                                                  (VkDevice device, const VkSemaphoreWaitInfo* pWaitInfo, uint64_t timeout) const = 0;
 virtual VkResult                       signalSemaphore                                                                 (VkDevice device, const VkSemaphoreSignalInfo* pSignalInfo) const = 0;
 virtual VkDeviceAddress                getBufferDeviceAddress                                                  (VkDevice device, const VkBufferDeviceAddressInfo* pInfo) const = 0;
 virtual uint64_t                       getBufferOpaqueCaptureAddress                                   (VkDevice device, const VkBufferDeviceAddressInfo* pInfo) const = 0;
@@ -154,7 +154,7 @@ virtual uint64_t                    getDeviceMemoryOpaqueCaptureAddress                             (VkDevice device, cons
 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, 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                       acquireNextImageKHR                                                             (VkDevice device, VkSwapchainKHR swapchain, uint64_t 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;
@@ -221,7 +221,7 @@ virtual void                                cmdSetViewportWScalingNV                                                (VkCommandBuffer commandBuffer, ui
 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                       getSwapchainCounterEXT                                                  (VkDevice device, VkSwapchainKHR swapchain, VkSurfaceCounterFlagBitsEXT counter, uint64_t* pCounterValue) const = 0;
 virtual VkResult                       getRefreshCycleDurationGOOGLE                                   (VkDevice device, VkSwapchainKHR swapchain, VkRefreshCycleDurationGOOGLE* pDisplayTimingProperties) 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;
@@ -258,7 +258,7 @@ virtual void                                cmdWriteAccelerationStructuresPropertiesNV              (VkCommandBuffer com
 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, uint32_t marker) const = 0;
-virtual VkResult                       getCalibratedTimestampsEXT                                              (VkDevice device, uint32_t timestampCount, const VkCalibratedTimestampInfoEXT* pTimestampInfos, deUint64* pTimestamps, deUint64* pMaxDeviation) const = 0;
+virtual VkResult                       getCalibratedTimestampsEXT                                              (VkDevice device, uint32_t timestampCount, const VkCalibratedTimestampInfoEXT* pTimestampInfos, uint64_t* pTimestamps, uint64_t* 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;
@@ -297,8 +297,8 @@ virtual VkResult                    createIndirectCommandsLayoutNV                                  (VkDevice device, const Vk
 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;
 virtual void                           destroyPrivateDataSlotEXT                                               (VkDevice device, VkPrivateDataSlotEXT privateDataSlot, const VkAllocationCallbacks* pAllocator) const = 0;
-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 VkResult                       setPrivateDataEXT                                                               (VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlotEXT privateDataSlot, uint64_t data) const = 0;
+virtual void                           getPrivateDataEXT                                                               (VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlotEXT privateDataSlot, uint64_t* pData) const = 0;
 virtual void                           cmdSetFragmentShadingRateEnumNV                                 (VkCommandBuffer commandBuffer, VkFragmentShadingRateNV shadingRate, const VkFragmentShadingRateCombinerOpKHR combinerOps[2]) 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;
index 5103c76..c20d3ff 100644 (file)
@@ -48,7 +48,7 @@ virtual VkResult      getDisplayPlaneCapabilities2KHR                                                                 (VkPhysicalDevice physi
 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, int32_t messageCode, const char* pLayerPrefix, const char* pMessage) const = 0;
+virtual void           debugReportMessageEXT                                                                                   (VkInstance instance, VkDebugReportFlagsEXT flags, VkDebugReportObjectTypeEXT objectType, uint64_t 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;
index d78b7ba..6fbaae3 100755 (executable)
@@ -106,8 +106,6 @@ PLATFORM_TYPES              = [
 PLATFORM_TYPE_NAMESPACE        = "pt"
 
 TYPE_SUBSTITUTIONS             = [
-       ("uint64_t",    "deUint64"),
-       ("int64_t",             "deInt64"),
        ("bool32_t",    "deUint32"),
        ("size_t",              "deUintptr"),
 
@@ -892,7 +890,7 @@ def genBitfieldSrc (bitfield):
        yield "typedef uint32_t %s;" % bitfield.name
 
 def genBitfield64Src (bitfield64):
-       yield "typedef deUint64 %s;" % bitfield64.name
+       yield "typedef uint64_t %s;" % bitfield64.name
        if len(bitfield64.values) > 0:
                ptrn = "static const " + bitfield64.name + " %s\t= %s;"
                for line in indentLines([ptrn % v for v in bitfield64.values]):