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

Merge 1821aff04e into 2eb1657d91

Browse Source
This commit is contained in:
H.İ 2016-09-13 14:11:19 +00:00 committed by GitHub
commit b820e8e30a
1 changed files with 59 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/vulkan.c
View File

@ -104,20 +104,66 @@ GLFWbool _glfwInitVulkan(void)
return GLFW_FALSE; return GLFW_FALSE;
} }
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
{ {
if (strcmp(ep[i].extensionName, "VK_KHR_surface") == 0) #if defined(_WIN32) || defined(WIN32)
_glfw.vk.KHR_surface = GLFW_TRUE; if(_glfw.vk.KHR_surface && _glfw.vk.KHR_win32_surface)
if (strcmp(ep[i].extensionName, "VK_KHR_win32_surface") == 0) break;
_glfw.vk.KHR_win32_surface = GLFW_TRUE; #else
if (strcmp(ep[i].extensionName, "VK_KHR_xlib_surface") == 0) if(_glfw.vk.KHR_surface && (_glfw.vk.KHR_xlib_surface || _glfw.vk.KHR_xcb_surface || _glfw.vk.KHR_wayland_surface || _glfw.vk.KHR_mir_surface))
_glfw.vk.KHR_xlib_surface = GLFW_TRUE; break;
if (strcmp(ep[i].extensionName, "VK_KHR_xcb_surface") == 0) #endif
_glfw.vk.KHR_xcb_surface = GLFW_TRUE; if(!_glfw.vk.KHR_surface)
if (strcmp(ep[i].extensionName, "VK_KHR_wayland_surface") == 0) {
_glfw.vk.KHR_wayland_surface = GLFW_TRUE; if (strcmp(ep[i].extensionName, "VK_KHR_surface") == 0)
if (strcmp(ep[i].extensionName, "VK_KHR_mir_surface") == 0) {
_glfw.vk.KHR_mir_surface = GLFW_TRUE; _glfw.vk.KHR_surface = GLFW_TRUE;
continue;
}
}
#if defined(_WIN32) || defined(WIN32)
if(!_glfw.vk.KHR_win32_surface)
{
if (strcmp(ep[i].extensionName, "VK_KHR_win32_surface") == 0)
{
_glfw.vk.KHR_win32_surface = GLFW_TRUE;
continue;
}
}
#else
if(!_glfw.vk.KHR_xlib_surface)
{
if (strcmp(ep[i].extensionName, "VK_KHR_xlib_surface") == 0)
{
_glfw.vk.KHR_xlib_surface = GLFW_TRUE;
continue;
}
}
if(!_glfw.vk.KHR_xcb_surface)
{
if (strcmp(ep[i].extensionName, "VK_KHR_xcb_surface") == 0)
{
_glfw.vk.KHR_xcb_surface = GLFW_TRUE;
continue;
}
}
if(!_glfw.vk.KHR_wayland_surface)
{
if (strcmp(ep[i].extensionName, "VK_KHR_wayland_surface") == 0)
{
_glfw.vk.KHR_wayland_surface = GLFW_TRUE;
continue;
}
}
if(!_glfw.vk.KHR_mir_surface)
{
if (strcmp(ep[i].extensionName, "VK_KHR_mir_surface") == 0)
{
_glfw.vk.KHR_mir_surface = GLFW_TRUE;
continue;
}
}
#endif
} }
free(ep); free(ep);