caio/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2026-08-28 01:45:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Mir: Get ready for Mir 1.0

Browse Source 
Clean up CMake finding and check version.  Change last remaining
deprecations.

Closes #979.
This commit is contained in:
Brandon Schaefer
2017-03-28 19:03:29 -07:00
committed by Camilla Löwy
parent 9f63a8abfa
commit c9003b5547
7 changed files with 228 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/GLFW/glfw3native.h
View File

@@ -394,9 +394,9 @@ GLFWAPI MirConnection* glfwGetMirDisplay(void);
*/
GLFWAPI int glfwGetMirMonitor(GLFWmonitor* monitor);
/*! @brief Returns the `MirSurface*` of the specified window.
/*! @brief Returns the `MirWindow*` of the specified window.
*
* @return The `MirSurface*` of the specified window, or `NULL` if an
* @return The `MirWindow*` of the specified window, or `NULL` if an
* [error](@ref error_handling) occurred.
*
* @thread_safety This function may be called from any thread. Access is not
@@ -406,7 +406,7 @@ GLFWAPI int glfwGetMirMonitor(GLFWmonitor* monitor);
*
* @ingroup native
*/
GLFWAPI MirSurface* glfwGetMirWindow(GLFWwindow* window);
GLFWAPI MirWindow* glfwGetMirWindow(GLFWwindow* window);
#endif
#if defined(GLFW_EXPOSE_NATIVE_EGL)