Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-11 04:53:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow object creation from callbacks

Browse Source
This commit is contained in:
Camilla Löwy 2017-05-02 16:58:02 +02:00
parent 4884232360
commit 16ddfafeaa
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/intro.dox
View File

@ -238,14 +238,10 @@ releases.
@subsection reentrancy Reentrancy @subsection reentrancy Reentrancy
GLFW event processing and object creation and destruction are not reentrant. GLFW event processing and object destruction are not reentrant. This means that
This means that the following functions must not be called from any callback the following functions must not be called from any callback function:
function:
- @ref glfwCreateWindow
- @ref glfwDestroyWindow - @ref glfwDestroyWindow
- @ref glfwCreateCursor
- @ref glfwCreateStandardCursor
- @ref glfwDestroyCursor - @ref glfwDestroyCursor
- @ref glfwPollEvents - @ref glfwPollEvents
- @ref glfwWaitEvents - @ref glfwWaitEvents

6
include/GLFW/glfw3.h
View File

@ -2148,8 +2148,6 @@ GLFWAPI void glfwWindowHint(int hint, int value);
* *
* @remark @wayland Screensaver inhibition is currently unimplemented. * @remark @wayland Screensaver inhibition is currently unimplemented.
* *
* @reentrancy This function must not be called from a callback.
*
* @thread_safety This function must only be called from the main thread. * @thread_safety This function must only be called from the main thread.
* *
* @sa @ref window_creation * @sa @ref window_creation
@ -3655,8 +3653,6 @@ GLFWAPI void glfwSetCursorPos(GLFWwindow* window, double xpos, double ypos);
* @pointer_lifetime The specified image data is copied before this function * @pointer_lifetime The specified image data is copied before this function
* returns. * returns.
* *
* @reentrancy This function must not be called from a callback.
*
* @thread_safety This function must only be called from the main thread. * @thread_safety This function must only be called from the main thread.
* *
* @sa @ref cursor_object * @sa @ref cursor_object
@ -3681,8 +3677,6 @@ GLFWAPI GLFWcursor* glfwCreateCursor(const GLFWimage* image, int xhot, int yhot)
* @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref * @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
* GLFW_INVALID_ENUM and @ref GLFW_PLATFORM_ERROR. * GLFW_INVALID_ENUM and @ref GLFW_PLATFORM_ERROR.
* *
* @reentrancy This function must not be called from a callback.
*
* @thread_safety This function must only be called from the main thread. * @thread_safety This function must only be called from the main thread.
* *
* @sa @ref cursor_object * @sa @ref cursor_object