Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-10-03 21:30:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

use VK_EXT_metal_surface #3

Browse Source
This commit is contained in:
ByunghoonKim 2020-01-06 00:55:07 +09:00 committed by GitHub
parent 3633ee733a
commit 62a5b4b85a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/cocoa_window.m
View File

@ -1751,7 +1751,6 @@ VkResult _glfwPlatformCreateWindowSurface(VkInstance instance,
VkMacOSSurfaceCreateInfoMVK sci; VkMacOSSurfaceCreateInfoMVK sci;
PFN_vkCreateMacOSSurfaceMVK vkCreateMacOSSurfaceMVK; PFN_vkCreateMacOSSurfaceMVK vkCreateMacOSSurfaceMVK;
vkCreateMacOSSurfaceMVK = (PFN_vkCreateMacOSSurfaceMVK) vkCreateMacOSSurfaceMVK = (PFN_vkCreateMacOSSurfaceMVK)
vkGetInstanceProcAddr(instance, "vkCreateMacOSSurfaceMVK"); vkGetInstanceProcAddr(instance, "vkCreateMacOSSurfaceMVK");
if (!vkCreateMacOSSurfaceMVK) if (!vkCreateMacOSSurfaceMVK)
@ -1765,7 +1764,6 @@ VkResult _glfwPlatformCreateWindowSurface(VkInstance instance,
VkMetalSurfaceCreateInfoEXT sci; VkMetalSurfaceCreateInfoEXT sci;
PFN_vkCreateMetalSurfaceEXT vkCreateMetalSurfaceEXT; PFN_vkCreateMetalSurfaceEXT vkCreateMetalSurfaceEXT;
vkCreateMetalSurfaceEXT = (PFN_vkCreateMetalSurfaceEXT) vkCreateMetalSurfaceEXT = (PFN_vkCreateMetalSurfaceEXT)
vkGetInstanceProcAddr(instance, "vkCreateMetalSurfaceEXT"); vkGetInstanceProcAddr(instance, "vkCreateMetalSurfaceEXT");
if (!vkCreateMetalSurfaceEXT) if (!vkCreateMetalSurfaceEXT)
@ -1801,6 +1799,7 @@ VkResult _glfwPlatformCreateWindowSurface(VkInstance instance,
[window->ns.view setLayer:window->ns.layer]; [window->ns.view setLayer:window->ns.layer];
[window->ns.view setWantsLayer:YES]; [window->ns.view setWantsLayer:YES];
memset(&sci, 0, sizeof(sci));
#if defined(VK_USE_PLATFORM_MACOS_MVK) #if defined(VK_USE_PLATFORM_MACOS_MVK)
sci.sType = VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK; sci.sType = VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK;
sci.pView = window->ns.view; sci.pView = window->ns.view;
@ -1808,7 +1807,6 @@ VkResult _glfwPlatformCreateWindowSurface(VkInstance instance,
err = vkCreateMacOSSurfaceMVK(instance, &sci, allocator, surface); err = vkCreateMacOSSurfaceMVK(instance, &sci, allocator, surface);
#elif defined(VK_USE_PLATFORM_METAL_EXT) #elif defined(VK_USE_PLATFORM_METAL_EXT)
memset(&sci, 0, sizeof(sci));
sci.sType = VK_STRUCTURE_TYPE_METAL_SURFACE_CREATE_INFO_EXT; sci.sType = VK_STRUCTURE_TYPE_METAL_SURFACE_CREATE_INFO_EXT;
sci.pNext = NULL; sci.pNext = NULL;
sci.flags = 0; sci.flags = 0;
@ -1816,7 +1814,6 @@ VkResult _glfwPlatformCreateWindowSurface(VkInstance instance,
err = vkCreateMetalSurfaceEXT(instance, &sci, allocator, surface); err = vkCreateMetalSurfaceEXT(instance, &sci, allocator, surface);
#endif #endif
if (err) if (err)
{ {
_glfwInputError(GLFW_PLATFORM_ERROR, _glfwInputError(GLFW_PLATFORM_ERROR,