mirror of
https://github.com/NVIDIA/cuda-samples.git
synced 2025-07-01 20:20:29 +08:00
Update the include files sequence for vulkan samples on Windows
This commit is contained in:
parent
b530f1cf42
commit
107f3f537f
@ -34,8 +34,10 @@
|
|||||||
#include <vulkan/vulkan.h>
|
#include <vulkan/vulkan.h>
|
||||||
#ifdef _WIN64
|
#ifdef _WIN64
|
||||||
#define NOMINMAX
|
#define NOMINMAX
|
||||||
#include <vulkan/vulkan_win32.h>
|
// Add windows.h to the include path firstly as dependency for other Windows headers
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
|
// Add other Windows headers
|
||||||
|
#include <vulkan/vulkan_win32.h>
|
||||||
#endif /* _WIN64 */
|
#endif /* _WIN64 */
|
||||||
|
|
||||||
/* remove _VK_TIMELINE_SEMAPHORE to use binary semaphores */
|
/* remove _VK_TIMELINE_SEMAPHORE to use binary semaphores */
|
||||||
@ -54,6 +56,7 @@ public:
|
|||||||
void init();
|
void init();
|
||||||
void *getMemHandle(VkDeviceMemory memory, VkExternalMemoryHandleTypeFlagBits handleType);
|
void *getMemHandle(VkDeviceMemory memory, VkExternalMemoryHandleTypeFlagBits handleType);
|
||||||
void *getSemaphoreHandle(VkSemaphore semaphore, VkExternalSemaphoreHandleTypeFlagBits handleType);
|
void *getSemaphoreHandle(VkSemaphore semaphore, VkExternalSemaphoreHandleTypeFlagBits handleType);
|
||||||
|
bool isVkPhysicalDeviceUuid(void *Uuid);
|
||||||
void createExternalSemaphore(VkSemaphore &semaphore, VkExternalSemaphoreHandleTypeFlagBits handleType);
|
void createExternalSemaphore(VkSemaphore &semaphore, VkExternalSemaphoreHandleTypeFlagBits handleType);
|
||||||
void createBuffer(VkDeviceSize size,
|
void createBuffer(VkDeviceSize size,
|
||||||
VkBufferUsageFlags usage,
|
VkBufferUsageFlags usage,
|
||||||
@ -85,6 +88,7 @@ protected:
|
|||||||
VkDebugUtilsMessengerEXT m_debugMessenger;
|
VkDebugUtilsMessengerEXT m_debugMessenger;
|
||||||
VkSurfaceKHR m_surface;
|
VkSurfaceKHR m_surface;
|
||||||
VkPhysicalDevice m_physicalDevice;
|
VkPhysicalDevice m_physicalDevice;
|
||||||
|
uint8_t m_deviceUUID[VK_UUID_SIZE];
|
||||||
VkDevice m_device;
|
VkDevice m_device;
|
||||||
VkQueue m_graphicsQueue;
|
VkQueue m_graphicsQueue;
|
||||||
VkQueue m_presentQueue;
|
VkQueue m_presentQueue;
|
||||||
@ -105,17 +109,15 @@ protected:
|
|||||||
std::vector<VkFence> m_inFlightFences;
|
std::vector<VkFence> m_inFlightFences;
|
||||||
std::vector<VkBuffer> m_uniformBuffers;
|
std::vector<VkBuffer> m_uniformBuffers;
|
||||||
std::vector<VkDeviceMemory> m_uniformMemory;
|
std::vector<VkDeviceMemory> m_uniformMemory;
|
||||||
VkSemaphore m_vkPresentationSemaphore;
|
|
||||||
VkSemaphore m_vkTimelineSemaphore;
|
|
||||||
VkDescriptorSetLayout m_descriptorSetLayout;
|
VkDescriptorSetLayout m_descriptorSetLayout;
|
||||||
VkDescriptorPool m_descriptorPool;
|
VkDescriptorPool m_descriptorPool;
|
||||||
std::vector<VkDescriptorSet> m_descriptorSets;
|
std::vector<VkDescriptorSet> m_descriptorSets;
|
||||||
VkImage m_depthImage;
|
|
||||||
VkDeviceMemory m_depthImageMemory;
|
VkImage m_depthImage;
|
||||||
VkImageView m_depthImageView;
|
VkDeviceMemory m_depthImageMemory;
|
||||||
size_t m_currentFrame;
|
VkImageView m_depthImageView;
|
||||||
bool m_framebufferResized;
|
size_t m_currentFrame;
|
||||||
uint8_t m_vkDeviceUUID[VK_UUID_SIZE];
|
bool m_framebufferResized;
|
||||||
|
|
||||||
virtual void initVulkanApp() {}
|
virtual void initVulkanApp() {}
|
||||||
virtual void fillRenderingCommandBuffer(VkCommandBuffer &buffer) {}
|
virtual void fillRenderingCommandBuffer(VkCommandBuffer &buffer) {}
|
||||||
@ -128,7 +130,7 @@ protected:
|
|||||||
std::vector<VkPipelineStageFlags> &waitStages) const;
|
std::vector<VkPipelineStageFlags> &waitStages) const;
|
||||||
virtual void getSignalFrameSemaphores(std::vector<VkSemaphore> &signal) const;
|
virtual void getSignalFrameSemaphores(std::vector<VkSemaphore> &signal) const;
|
||||||
virtual VkDeviceSize getUniformSize() const;
|
virtual VkDeviceSize getUniformSize() const;
|
||||||
virtual void updateUniformBuffer(uint32_t imageIndex);
|
virtual void updateUniformBuffer(uint32_t imageIndex, size_t globalFrame);
|
||||||
virtual void drawFrame();
|
virtual void drawFrame();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
@ -34,8 +34,10 @@
|
|||||||
#include <vulkan/vulkan.h>
|
#include <vulkan/vulkan.h>
|
||||||
#ifdef _WIN64
|
#ifdef _WIN64
|
||||||
#define NOMINMAX
|
#define NOMINMAX
|
||||||
#include <vulkan/vulkan_win32.h>
|
// Add windows.h to the include path firstly as dependency for other Windows headers
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
|
// Add other Windows headers
|
||||||
|
#include <vulkan/vulkan_win32.h>
|
||||||
#endif /* _WIN64 */
|
#endif /* _WIN64 */
|
||||||
|
|
||||||
struct GLFWwindow;
|
struct GLFWwindow;
|
||||||
|
@ -27,10 +27,12 @@
|
|||||||
|
|
||||||
#define GLFW_INCLUDE_VULKAN
|
#define GLFW_INCLUDE_VULKAN
|
||||||
#ifdef _WIN64
|
#ifdef _WIN64
|
||||||
|
// Add windows.h to the include path firstly as dependency for other Windows headers
|
||||||
|
#include <windows.h>
|
||||||
|
// Add other Windows headers
|
||||||
#include <VersionHelpers.h>
|
#include <VersionHelpers.h>
|
||||||
#include <aclapi.h>
|
#include <aclapi.h>
|
||||||
#include <dxgi1_2.h>
|
#include <dxgi1_2.h>
|
||||||
#include <windows.h>
|
|
||||||
#define _USE_MATH_DEFINES
|
#define _USE_MATH_DEFINES
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user