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/macos | |
| parent | dfe226b93346c208787728eceecc2c64d81a9553 (diff) | |
| download | redot-engine-f4589434551e27c519515fdae15737582820bd65.tar.gz | |
[macOS / iOS] Switch Vulkan init to VK_EXT_metal_surface extension.
Diffstat (limited to 'platform/macos')
| -rw-r--r-- | platform/macos/display_server_macos.mm | 2 | ||||
| -rw-r--r-- | platform/macos/rendering_context_driver_vulkan_macos.h | 4 | ||||
| -rw-r--r-- | platform/macos/rendering_context_driver_vulkan_macos.mm | 12 |
3 files changed, 9 insertions, 9 deletions
diff --git a/platform/macos/display_server_macos.mm b/platform/macos/display_server_macos.mm index ad8afaf46b..114b371580 100644 --- a/platform/macos/display_server_macos.mm +++ b/platform/macos/display_server_macos.mm @@ -203,7 +203,7 @@ DisplayServerMacOS::WindowID DisplayServerMacOS::_create_window(WindowMode p_mod } wpd; #ifdef VULKAN_ENABLED if (rendering_driver == "vulkan") { - wpd.vulkan.view_ptr = &wd.window_view; + wpd.vulkan.layer_ptr = (CAMetalLayer *const *)&layer; } #endif Error err = rendering_context->window_create(window_id_counter, &wpd); diff --git a/platform/macos/rendering_context_driver_vulkan_macos.h b/platform/macos/rendering_context_driver_vulkan_macos.h index bbc67581db..32f8891a2e 100644 --- a/platform/macos/rendering_context_driver_vulkan_macos.h +++ b/platform/macos/rendering_context_driver_vulkan_macos.h @@ -35,7 +35,7 @@ #include "drivers/vulkan/rendering_context_driver_vulkan.h" -#import <AppKit/AppKit.h> +#import <QuartzCore/CAMetalLayer.h> class RenderingContextDriverVulkanMacOS : public RenderingContextDriverVulkan { private: @@ -46,7 +46,7 @@ protected: public: struct WindowPlatformData { - const id *view_ptr; + CAMetalLayer *const *layer_ptr; }; RenderingContextDriverVulkanMacOS(); diff --git a/platform/macos/rendering_context_driver_vulkan_macos.mm b/platform/macos/rendering_context_driver_vulkan_macos.mm index e0f8bf9e67..afefe5a6f7 100644 --- a/platform/macos/rendering_context_driver_vulkan_macos.mm +++ b/platform/macos/rendering_context_driver_vulkan_macos.mm @@ -35,22 +35,22 @@ #ifdef USE_VOLK #include <volk.h> #else -#include <vulkan/vulkan.h> +#include <vulkan/vulkan_metal.h> #endif const char *RenderingContextDriverVulkanMacOS::_get_platform_surface_extension() const { - return VK_MVK_MACOS_SURFACE_EXTENSION_NAME; + return VK_EXT_METAL_SURFACE_EXTENSION_NAME; } RenderingContextDriver::SurfaceID RenderingContextDriverVulkanMacOS::surface_create(const void *p_platform_data) { const WindowPlatformData *wpd = (const WindowPlatformData *)(p_platform_data); - VkMacOSSurfaceCreateInfoMVK create_info = {}; - create_info.sType = VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK; - create_info.pView = (__bridge const void *)(*wpd->view_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 = vkCreateMacOSSurfaceMVK(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); |