diff options
| author | Quentin Ladevie <ladevie.quentin@gmail.com> | 2021-03-14 23:28:39 +0100 |
|---|---|---|
| committer | Quentin Ladevie <ladevie.quentin@gmail.com> | 2021-03-14 23:28:39 +0100 |
| commit | da0bf8dc570f6e8421b8d80546dfce913b8251ad (patch) | |
| tree | 06646be201b1157923a8f08e7d7562859cb3f1a5 /include | |
| parent | 26369a8cdf90320cdd472fdca23ee38f7ce48302 (diff) | |
Make it compile on mac
Diffstat (limited to 'include')
| -rw-r--r-- | include/defines.hpp | 2 | ||||
| -rw-r--r-- | include/vk-api.hpp | 3 | ||||
| -rw-r--r-- | include/vulkan-loader.hpp | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/include/defines.hpp b/include/defines.hpp index 2cb14a0..2b56c7a 100644 --- a/include/defines.hpp +++ b/include/defines.hpp @@ -5,6 +5,8 @@ #define LINUX #elif defined(_WIN32) || defined(_WIN64) #define WINDOWS +#elif defined(__APPLE__) +#define MACOS #endif #endif // !__DEFINES_HPP_ diff --git a/include/vk-api.hpp b/include/vk-api.hpp index 284f75c..59d09b7 100644 --- a/include/vk-api.hpp +++ b/include/vk-api.hpp @@ -2,7 +2,6 @@ #define __VK_API_HPP_ #include <vector> -#include <optional> #include <string> #include "vk-context.hpp" @@ -101,7 +100,7 @@ class vkapi { void destroy_surface(VkSurfaceKHR surface); - Swapchain create_swapchain(VkSurfaceKHR surface, size_t min_image_count, VkImageUsageFlags usages, std::optional<std::reference_wrapper<Swapchain>> old_swapchain); + Swapchain create_swapchain(VkSurfaceKHR surface, size_t min_image_count, VkImageUsageFlags usages, VkSwapchainKHR old_swapchain); void destroy_swapchain(Swapchain& swapchain); void update_descriptor_set_buffer(VkDescriptorSet set, VkDescriptorSetLayoutBinding binding, Buffer& buffer); diff --git a/include/vulkan-loader.hpp b/include/vulkan-loader.hpp index 243221d..b4bef68 100644 --- a/include/vulkan-loader.hpp +++ b/include/vulkan-loader.hpp @@ -7,6 +7,8 @@ #define VK_USE_PLATFORM_WIN32_KHR #elif defined(LINUX) #define VK_USE_PLATFORM_XCB_KHR +#elif defined(MACOS) +#define VK_USE_PLATFORM_METAL_EXT #endif #define VK_NO_PROTOTYPES @@ -28,6 +30,8 @@ #define PLATFORM_VULKAN_INSTANCE_FUNCTIONS X(vkCreateWin32SurfaceKHR) #elif defined(VK_USE_PLATFORM_XCB_KHR) #define PLATFORM_VULKAN_INSTANCE_FUNCTIONS X(vkCreateXcbSurfaceKHR) +#elif defined(VK_USE_PLATFORM_METAL_EXT) +#define PLATFORM_VULKAN_INSTANCE_FUNCTIONS X(vkCreateMetalSurfaceEXT) #else #define PLATFORM_VULKAN_INSTANCE_FUNCTIONS #endif |