diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-10-02 15:18:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-02 15:18:03 +0200 |
| commit | 0d07a935e90eea0f652448784ea9cf6542593912 (patch) | |
| tree | 593efc8b2d5307f92d6ecbe0b341c7d9d35d1d24 /platform/iphone/vulkan_context_iphone.mm | |
| parent | e2e20ae41bd9f1828f0a4812c4b95aaf3a7eeb5b (diff) | |
| parent | 6ee74de9eeb6ff0fdcad81955bd989e793625edc (diff) | |
Merge pull request #42503 from naithar/feature/ios-cleanup-arc
[4.0] [iOS] Switch to ARC. Refactoring and cleanup.
Diffstat (limited to 'platform/iphone/vulkan_context_iphone.mm')
| -rw-r--r-- | platform/iphone/vulkan_context_iphone.mm | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/platform/iphone/vulkan_context_iphone.mm b/platform/iphone/vulkan_context_iphone.mm index cb4dbe7f85..d62e826957 100644 --- a/platform/iphone/vulkan_context_iphone.mm +++ b/platform/iphone/vulkan_context_iphone.mm @@ -35,14 +35,12 @@ const char *VulkanContextIPhone::_get_platform_surface_extension() const { return VK_MVK_IOS_SURFACE_EXTENSION_NAME; } -Error VulkanContextIPhone::window_create(DisplayServer::WindowID p_window_id, - CALayer *p_metal_layer, int p_width, - int p_height) { +Error VulkanContextIPhone::window_create(DisplayServer::WindowID p_window_id, CALayer *p_metal_layer, int p_width, int p_height) { VkIOSSurfaceCreateInfoMVK createInfo; createInfo.sType = VK_STRUCTURE_TYPE_IOS_SURFACE_CREATE_INFO_MVK; createInfo.pNext = NULL; createInfo.flags = 0; - createInfo.pView = p_metal_layer; + createInfo.pView = (__bridge const void *)p_metal_layer; VkSurfaceKHR surface; VkResult err = |