mirror of
https://github.com/glfw/glfw.git
synced 2026-09-21 16:44:11 +00:00
Merge branch 'master' into multi-monitor
Conflicts: include/GL/glfw3.h src/window.c tests/glfwinfo.c
This commit is contained in:
Camilla Berglund
+61
-12
@@ -459,88 +459,124 @@ extern "C" {
|
||||
* @{ */
|
||||
|
||||
/*! @brief @c GL_TRUE if the window has focus, or @c GL_FALSE otherwise.
|
||||
* @see glfwGetWindowParam
|
||||
*/
|
||||
#define GLFW_FOCUSED 0x00020001
|
||||
/*! @brief @c GL_TRUE if the window is iconified, or @c GL_FALSE otherwise.
|
||||
* @see glfwGetWindowParam
|
||||
*/
|
||||
#define GLFW_ICONIFIED 0x00020002
|
||||
/*! @brief @c GL_TRUE if the window has been requested to close, or @c GL_FALSE
|
||||
* otherwise.
|
||||
* @see glfwGetWindowParam
|
||||
*/
|
||||
#define GLFW_CLOSE_REQUESTED 0x00020003
|
||||
/*! @brief The client API version revision.
|
||||
* @see glfwGetWindowParam
|
||||
*/
|
||||
#define GLFW_CONTEXT_REVISION 0x00020004
|
||||
|
||||
/*! @brief The bit depth of the red component of the color buffer.
|
||||
* @see glfwWindowHint
|
||||
*/
|
||||
#define GLFW_RED_BITS 0x00021000
|
||||
/*! @brief The bit depth of the green component of the color buffer.
|
||||
* @see glfwWindowHint
|
||||
*/
|
||||
#define GLFW_GREEN_BITS 0x00021001
|
||||
/*! @brief The bit depth of the blue component of the color buffer.
|
||||
* @see glfwWindowHint
|
||||
*/
|
||||
#define GLFW_BLUE_BITS 0x00021002
|
||||
/*! @brief The bit depth of the alpha component of the color buffer.
|
||||
* @see glfwWindowHint
|
||||
*/
|
||||
#define GLFW_ALPHA_BITS 0x00021003
|
||||
/*! @brief The bit depth of the depth buffer of the default framebuffer.
|
||||
* @see glfwWindowHint
|
||||
*/
|
||||
#define GLFW_DEPTH_BITS 0x00021004
|
||||
/*! @brief The bit depth of the stencil buffer of the default framebuffer.
|
||||
* @see glfwWindowHint
|
||||
*/
|
||||
#define GLFW_STENCIL_BITS 0x00021005
|
||||
/*! @brief The monitor refresh rate.
|
||||
* @see glfwWindowHint glfwGetWindowParam
|
||||
*/
|
||||
#define GLFW_REFRESH_RATE 0x00021006
|
||||
/*! @brief The bit depth of the red component of the accumulation buffer.
|
||||
* @see glfwWindowHint
|
||||
*/
|
||||
#define GLFW_ACCUM_RED_BITS 0x00021007
|
||||
/*! @brief The bit depth of the red component of the accumulation buffer.
|
||||
* @see glfwWindowHint
|
||||
*/
|
||||
#define GLFW_ACCUM_GREEN_BITS 0x00021008
|
||||
/*! @brief The bit depth of the red component of the accumulation buffer.
|
||||
* @see glfwWindowHint
|
||||
*/
|
||||
#define GLFW_ACCUM_BLUE_BITS 0x00021009
|
||||
/*! @brief The bit depth of the red component of the accumulation buffer.
|
||||
* @see glfwWindowHint
|
||||
*/
|
||||
#define GLFW_ACCUM_ALPHA_BITS 0x0002100A
|
||||
/*! @brief The number of auxiliary buffers.
|
||||
* @see glfwWindowHint
|
||||
*/
|
||||
#define GLFW_AUX_BUFFERS 0x0002100B
|
||||
/*! @brief @c GL_TRUE for stereo rendering, or @c GL_FALSE otherwise.
|
||||
* @see glfwWindowHint
|
||||
*/
|
||||
#define GLFW_STEREO 0x0002100C
|
||||
/*! @brief The number of samples used for default framebuffer multisampling, or
|
||||
* zero to disable multisampling.
|
||||
* @see glfwWindowHint
|
||||
*/
|
||||
#define GLFW_FSAA_SAMPLES 0x0002100E
|
||||
/*! @brief @c GL_TRUE if the framebuffer should be sRGB capable, or @c GL_FALSE
|
||||
* otherwise.
|
||||
* @see glfwWindowHint
|
||||
*/
|
||||
#define GLFW_SRGB_CAPABLE 0x0002100F
|
||||
|
||||
/*! @brief The @link clients client API @endlink to create a context for.
|
||||
* @see glfwWindowHint glfwGetWindowParam
|
||||
*/
|
||||
#define GLFW_CLIENT_API 0x00022000
|
||||
/*! @see glfwWindowHint glfwGetWindowParam
|
||||
*/
|
||||
#define GLFW_CONTEXT_VERSION_MAJOR 0x00022001
|
||||
/*! @see glfwWindowHint glfwGetWindowParam
|
||||
*/
|
||||
#define GLFW_CONTEXT_VERSION_MINOR 0x00022002
|
||||
/*! @see glfwWindowHint glfwGetWindowParam
|
||||
*/
|
||||
#define GLFW_CONTEXT_ROBUSTNESS 0x00022003
|
||||
/*! @see glfwWindowHint glfwGetWindowParam
|
||||
*/
|
||||
#define GLFW_OPENGL_FORWARD_COMPAT 0x00022004
|
||||
/*! @see glfwWindowHint glfwGetWindowParam
|
||||
*/
|
||||
#define GLFW_OPENGL_DEBUG_CONTEXT 0x00022005
|
||||
/*! @see glfwWindowHint glfwGetWindowParam
|
||||
*/
|
||||
#define GLFW_OPENGL_PROFILE 0x00022006
|
||||
/*! @brief @c GL_TRUE if the window is resizable, or @c GL_FALSE otherwise.
|
||||
* @see glfwWindowHint glfwGetWindowParam
|
||||
*/
|
||||
#define GLFW_RESIZABLE 0x00022007
|
||||
/*! @brief @c GL_TRUE if the window is visible, or @c GL_FALSE otherwise.
|
||||
* @see glfwWindowHint glfwGetWindowParam
|
||||
*/
|
||||
#define GLFW_VISIBLE 0x00022008
|
||||
/*! @brief The x-coordinate, in pixels, of the upper-left corner of the
|
||||
* client area of the window.
|
||||
* @see glfwWindowHint glfwGetWindowParam
|
||||
*/
|
||||
#define GLFW_POSITION_X 0x00022009
|
||||
/*! @brief The y-coordinate, in pixels, of the upper-left corner of the
|
||||
* client area of the window.
|
||||
* @see glfwWindowHint glfwGetWindowParam
|
||||
*/
|
||||
#define GLFW_POSITION_Y 0x0002200A
|
||||
|
||||
@@ -1082,6 +1118,8 @@ GLFWAPI void glfwSetGammaRamp(const GLFWgammaramp* ramp);
|
||||
* The @ref GLFW_CONTEXT_VERSION_MAJOR and @ref GLFW_CONTEXT_VERSION_MINOR
|
||||
* hints are set to 1 and 0, respectively.
|
||||
*
|
||||
* The @ref GLFW_CONTEXT_ROBUSTNESS hint is set to @ref GLFW_NO_ROBUSTNESS.
|
||||
*
|
||||
* All other hints are set to 0.
|
||||
*
|
||||
* @ingroup window
|
||||
@@ -1102,8 +1140,10 @@ GLFWAPI void glfwDefaultWindowHints(void);
|
||||
* specify the desired bit depths of the various components of the default
|
||||
* framebuffer.
|
||||
*
|
||||
* The @ref GLFW_REFRESH_RATE hint specifies the desired monitor refresh rate
|
||||
* for fullscreen windows.
|
||||
* The @ref GLFW_REFRESH_RATE hint specifies the desired monitor refresh rate,
|
||||
* in Hz, of the video mode for a fullscreen window, or zero to let the system
|
||||
* choose a suitable refresh rate. If a windowed mode window is created, this
|
||||
* hint is ignored.
|
||||
*
|
||||
* The @ref GLFW_ACCUM_RED_BITS, @ref GLFW_ACCUM_GREEN_BITS, @ref
|
||||
* GLFW_ACCUM_BLUE_BITS and @ref GLFW_ACCUM_ALPHA_BITS hints specify the
|
||||
@@ -1137,17 +1177,23 @@ GLFWAPI void glfwDefaultWindowHints(void);
|
||||
* For OpenGL ES, these hints are hard constraints, as there is no backward
|
||||
* compatibility between OpenGL ES versions.
|
||||
*
|
||||
* The @ref GLFW_OPENGL_FORWARD_COMPAT hint specifies whether the OpenGL
|
||||
* context should be forward-compatible, i.e. one where all functionality
|
||||
* deprecated in the requested version of OpenGL is removed.
|
||||
* If an OpenGL context is requested, the @ref GLFW_OPENGL_FORWARD_COMPAT hint
|
||||
* specifies whether the OpenGL context should be forward-compatible, i.e. one
|
||||
* where all functionality deprecated in the requested version of OpenGL is
|
||||
* removed. This may only be used if the requested OpenGL version is 3.0 or
|
||||
* above. If another client API is requested, this hint is ignored.
|
||||
*
|
||||
* The @ref GLFW_OPENGL_DEBUG_CONTEXT hint specifies whether to create a debug
|
||||
* OpenGL context, which may have additional error and performance issue
|
||||
* reporting functionality.
|
||||
* If an OpenGL context is requested, the @ref GLFW_OPENGL_DEBUG_CONTEXT hint
|
||||
* specifies whether to create a debug OpenGL context, which may have
|
||||
* additional error and performance issue reporting functionality. If another
|
||||
* client API is requested, this hint is ignored.
|
||||
*
|
||||
* The @ref GLFW_OPENGL_PROFILE hint specifies which OpenGL profile to create
|
||||
* the context for. Possible values are @ref GLFW_OPENGL_NO_PROFILE, @ref
|
||||
* GLFW_OPENGL_CORE_PROFILE and @ref GLFW_OPENGL_COMPAT_PROFILE.
|
||||
* If an OpenGL context is requested, the @ref GLFW_OPENGL_PROFILE hint
|
||||
* specifies which OpenGL profile to create the context for. Possible values
|
||||
* are @ref GLFW_OPENGL_NO_PROFILE, @ref GLFW_OPENGL_CORE_PROFILE and @ref
|
||||
* GLFW_OPENGL_COMPAT_PROFILE. This may only be used if the requested OpenGL
|
||||
* version is 3.2 or above. If another client API is requested, this hint
|
||||
* is ignored.
|
||||
*
|
||||
* The @ref GLFW_CONTEXT_ROBUSTNESS hint specifies the robustness strategy to
|
||||
* be used by the context.
|
||||
@@ -1169,9 +1215,12 @@ GLFWAPI void glfwDefaultWindowHints(void);
|
||||
* find out the actual properties of the created window and context, use the
|
||||
* @ref glfwGetWindowParam function.
|
||||
*
|
||||
* The following window hints are hard constraints:
|
||||
* The following hints are hard constraints:
|
||||
* @arg @ref GLFW_STEREO
|
||||
* @arg @ref GLFW_CLIENT_API
|
||||
*
|
||||
* The following additional hints are hard constraints if requesting an OpenGL
|
||||
* context:
|
||||
* @arg @ref GLFW_OPENGL_FORWARD_COMPAT
|
||||
* @arg @ref GLFW_OPENGL_PROFILE
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user