diff options
| author | bruvzg <7645683+bruvzg@users.noreply.github.com> | 2024-02-05 23:50:48 +0200 |
|---|---|---|
| committer | bruvzg <7645683+bruvzg@users.noreply.github.com> | 2024-02-13 16:57:02 +0200 |
| commit | f4589434551e27c519515fdae15737582820bd65 (patch) | |
| tree | bbd5dd5d5f7435bb83de526e81f5ee7d8d93c2aa /platform/ios | |
| parent | dfe226b93346c208787728eceecc2c64d81a9553 (diff) | |
| download | redot-engine-f4589434551e27c519515fdae15737582820bd65.tar.gz | |
[macOS / iOS] Switch Vulkan init to VK_EXT_metal_surface extension.
Diffstat (limited to 'platform/ios')
| -rw-r--r-- | platform/ios/display_server_ios.mm | 2 | ||||
| -rw-r--r-- | platform/ios/rendering_context_driver_vulkan_ios.h | 4 | ||||
| -rw-r--r-- | platform/ios/rendering_context_driver_vulkan_ios.mm | 12 |
3 files changed, 9 insertions, 9 deletions
diff --git a/platform/ios/display_server_ios.mm b/platform/ios/display_server_ios.mm index c371f2777c..2895dffdfa 100644 --- a/platform/ios/display_server_ios.mm +++ b/platform/ios/display_server_ios.mm @@ -80,7 +80,7 @@ DisplayServerIOS::DisplayServerIOS(const String &p_rendering_driver, WindowMode if (!layer) { ERR_FAIL_MSG("Failed to create iOS Vulkan rendering layer."); } - wpd.vulkan.layer_ptr = &layer; + wpd.vulkan.layer_ptr = (CAMetalLayer *const *)&layer; rendering_context = memnew(RenderingContextDriverVulkanIOS); } #endif diff --git a/platform/ios/rendering_context_driver_vulkan_ios.h b/platform/ios/rendering_context_driver_vulkan_ios.h index 0778993a05..dc85ff738d 100644 --- a/platform/ios/rendering_context_driver_vulkan_ios.h +++ b/platform/ios/rendering_context_driver_vulkan_ios.h @@ -35,7 +35,7 @@ #include "drivers/vulkan/rendering_context_driver_vulkan.h" -#import <UIKit/UIKit.h> +#import <QuartzCore/CAMetalLayer.h> class RenderingContextDriverVulkanIOS : public RenderingContextDriverVulkan { private: @@ -46,7 +46,7 @@ protected: public: struct WindowPlatformData { - CALayer *const *layer_ptr; + CAMetalLayer *const *layer_ptr; }; RenderingContextDriverVulkanIOS(); diff --git a/platform/ios/rendering_context_driver_vulkan_ios.mm b/platform/ios/rendering_context_driver_vulkan_ios.mm index 7e9c3e0e44..6a6af1bc41 100644 --- a/platform/ios/rendering_context_driver_vulkan_ios.mm +++ b/platform/ios/rendering_context_driver_vulkan_ios.mm @@ -35,22 +35,22 @@ #ifdef USE_VOLK #include <volk.h> #else -#include <vulkan/vulkan.h> +#include <vulkan/vulkan_metal.h> #endif const char *RenderingContextDriverVulkanIOS::_get_platform_surface_extension() const { - return VK_MVK_IOS_SURFACE_EXTENSION_NAME; + return VK_EXT_METAL_SURFACE_EXTENSION_NAME; } RenderingContextDriver::SurfaceID RenderingContextDriverVulkanIOS::surface_create(const void *p_platform_data) { const WindowPlatformData *wpd = (const WindowPlatformData *)(p_platform_data); - VkIOSSurfaceCreateInfoMVK create_info = {}; - create_info.sType = VK_STRUCTURE_TYPE_IOS_SURFACE_CREATE_INFO_MVK; - create_info.pView = (__bridge const void *)(*wpd->layer_ptr); + VkMetalSurfaceCreateInfoEXT create_info = {}; + create_info.sType = VK_STRUCTURE_TYPE_METAL_SURFACE_CREATE_INFO_EXT; + create_info.pLayer = *wpd->layer_ptr; VkSurfaceKHR vk_surface = VK_NULL_HANDLE; - VkResult err = vkCreateIOSSurfaceMVK(instance_get(), &create_info, nullptr, &vk_surface); + VkResult err = vkCreateMetalSurfaceEXT(instance_get(), &create_info, nullptr, &vk_surface); ERR_FAIL_COND_V(err != VK_SUCCESS, SurfaceID()); Surface *surface = memnew(Surface); |