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

X11: GLFW_X11_XCB_VULKAN_SURFACE instead of GLFW_X11_XCB

Browse Source
This commit is contained in:
Nicolas Caramelli 2020-11-19 09:15:53 +01:00
parent 71eb156c6d
commit 9462981ab3
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/GLFW/glfw3.h
View File

@ -1252,9 +1252,9 @@ extern "C" {
#define GLFW_COCOA_MENUBAR 0x00051002 #define GLFW_COCOA_MENUBAR 0x00051002
/*! @brief X11 specific init hint. /*! @brief X11 specific init hint.
* *
* X11 specific [init hint](@ref GLFW_X11_XCB_hint). * X11 specific [init hint](@ref GLFW_X11_XCB_VULKAN_SURFACE_hint).
*/ */
#define GLFW_X11_XCB 0x00051003 #define GLFW_X11_XCB_VULKAN_SURFACE 0x00052001
/*! @} */ /*! @} */
#define GLFW_DONT_CARE -1 #define GLFW_DONT_CARE -1

8
src/init.c
View File

@ -58,7 +58,9 @@ static _GLFWinitconfig _glfwInitHints =
GLFW_TRUE, // macOS menu bar GLFW_TRUE, // macOS menu bar
GLFW_TRUE // macOS bundle chdir GLFW_TRUE // macOS bundle chdir
}, },
GLFW_TRUE, // X11 XCB {
GLFW_TRUE, // X11 XCB Vulkan surface
},
}; };
// Terminate the library // Terminate the library
@ -299,8 +301,8 @@ GLFWAPI void glfwInitHint(int hint, int value)
case GLFW_COCOA_MENUBAR: case GLFW_COCOA_MENUBAR:
_glfwInitHints.ns.menubar = value; _glfwInitHints.ns.menubar = value;
return; return;
case GLFW_X11_XCB: case GLFW_X11_XCB_VULKAN_SURFACE:
_glfwInitHints.x11_xcb = value; _glfwInitHints.x11.xcbVulkanSurface = value;
return; return;
} }

4
src/internal.h
View File

@ -248,7 +248,9 @@ struct _GLFWinitconfig
GLFWbool menubar; GLFWbool menubar;
GLFWbool chdir; GLFWbool chdir;
} ns; } ns;
GLFWbool x11_xcb; struct {
GLFWbool xcbVulkanSurface;
} x11;
}; };
// Window configuration // Window configuration

2
src/x11_init.c
View File

@ -813,7 +813,7 @@ static GLFWbool initExtensions(void)
XkbGroupStateMask, XkbGroupStateMask); XkbGroupStateMask, XkbGroupStateMask);
} }
if (_glfw.hints.init.x11_xcb) if (_glfw.hints.init.x11.xcbVulkanSurface)
{ {
#if defined(__CYGWIN__) #if defined(__CYGWIN__)
_glfw.x11.x11xcb.handle = _glfw_dlopen("libX11-xcb-1.so"); _glfw.x11.x11xcb.handle = _glfw_dlopen("libX11-xcb-1.so");