Quellcode durchsuchen

Allow object creation from callbacks

Camilla Löwy vor 8 Jahren
Ursprung
Commit
16ddfafeaa
2 geänderte Dateien mit 2 neuen und 12 gelöschten Zeilen
  1. 2 6
      docs/intro.dox
  2. 0 6
      include/GLFW/glfw3.h

+ 2 - 6
docs/intro.dox

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

+ 0 - 6
include/GLFW/glfw3.h

@@ -2148,8 +2148,6 @@ GLFWAPI void glfwWindowHint(int hint, int value);
  *
  *  @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.
  *
  *  @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
  *  returns.
  *
- *  @reentrancy This function must not be called from a callback.
- *
  *  @thread_safety This function must only be called from the main thread.
  *
  *  @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
  *  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.
  *
  *  @sa @ref cursor_object