From da3b7a2b3cecd5f73a19bcc7fa502169b72c90bf Mon Sep 17 00:00:00 2001 From: shawnz Date: Mon, 19 May 2025 17:43:08 +0800 Subject: [PATCH] Update the vulkanImageCUDA/vulkanImageCUDA.cu for Windows headers --- .../simpleVulkan/VulkanBaseApp.h | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Samples/5_Domain_Specific/simpleVulkan/VulkanBaseApp.h b/Samples/5_Domain_Specific/simpleVulkan/VulkanBaseApp.h index 616b1c14..7354881d 100644 --- a/Samples/5_Domain_Specific/simpleVulkan/VulkanBaseApp.h +++ b/Samples/5_Domain_Specific/simpleVulkan/VulkanBaseApp.h @@ -34,9 +34,9 @@ #include #ifdef _WIN64 #define NOMINMAX -// Add windows.h to the include path firstly as dependency for other Windows headers +// Add windows.h to the include path #include -// Add other Windows headers +// Add vulkan_win32.h to the include path #include #endif /* _WIN64 */ @@ -56,7 +56,6 @@ public: void init(); void *getMemHandle(VkDeviceMemory memory, VkExternalMemoryHandleTypeFlagBits handleType); void *getSemaphoreHandle(VkSemaphore semaphore, VkExternalSemaphoreHandleTypeFlagBits handleType); - bool isVkPhysicalDeviceUuid(void *Uuid); void createExternalSemaphore(VkSemaphore &semaphore, VkExternalSemaphoreHandleTypeFlagBits handleType); void createBuffer(VkDeviceSize size, VkBufferUsageFlags usage, @@ -88,7 +87,6 @@ protected: VkDebugUtilsMessengerEXT m_debugMessenger; VkSurfaceKHR m_surface; VkPhysicalDevice m_physicalDevice; - uint8_t m_deviceUUID[VK_UUID_SIZE]; VkDevice m_device; VkQueue m_graphicsQueue; VkQueue m_presentQueue; @@ -109,15 +107,17 @@ protected: std::vector m_inFlightFences; std::vector m_uniformBuffers; std::vector m_uniformMemory; + VkSemaphore m_vkPresentationSemaphore; + VkSemaphore m_vkTimelineSemaphore; VkDescriptorSetLayout m_descriptorSetLayout; VkDescriptorPool m_descriptorPool; std::vector m_descriptorSets; - - VkImage m_depthImage; - VkDeviceMemory m_depthImageMemory; - VkImageView m_depthImageView; - size_t m_currentFrame; - bool m_framebufferResized; + VkImage m_depthImage; + VkDeviceMemory m_depthImageMemory; + VkImageView m_depthImageView; + size_t m_currentFrame; + bool m_framebufferResized; + uint8_t m_vkDeviceUUID[VK_UUID_SIZE]; virtual void initVulkanApp() {} virtual void fillRenderingCommandBuffer(VkCommandBuffer &buffer) {} @@ -130,7 +130,7 @@ protected: std::vector &waitStages) const; virtual void getSignalFrameSemaphores(std::vector &signal) const; virtual VkDeviceSize getUniformSize() const; - virtual void updateUniformBuffer(uint32_t imageIndex, size_t globalFrame); + virtual void updateUniformBuffer(uint32_t imageIndex); virtual void drawFrame(); private: