Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-22 18:15:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into multi-monitor

Browse Source
This commit is contained in:
Camilla Berglund 2012-12-13 01:50:09 +01:00
commit 55f7813d68
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/GL/glfw3.h
View File

@ -510,7 +510,8 @@ extern "C" {
/*! @brief @c GL_TRUE for stereo rendering, or @c GL_FALSE otherwise. /*! @brief @c GL_TRUE for stereo rendering, or @c GL_FALSE otherwise.
*/ */
#define GLFW_STEREO 0x0002100C #define GLFW_STEREO 0x0002100C
/*! @brief The number of samples used for default framebuffer multisampling. /*! @brief The number of samples used for default framebuffer multisampling, or
* zero to disable multisampling.
*/ */
#define GLFW_FSAA_SAMPLES 0x0002100E #define GLFW_FSAA_SAMPLES 0x0002100E
/*! @brief @c GL_TRUE if the framebuffer should be sRGB capable, or @c GL_FALSE /*! @brief @c GL_TRUE if the framebuffer should be sRGB capable, or @c GL_FALSE
@ -1133,10 +1134,12 @@ GLFWAPI void glfwDefaultWindowHints(void);
* available. * available.
* *
* The @ref GLFW_OPENGL_FORWARD_COMPAT hint specifies whether the OpenGL * The @ref GLFW_OPENGL_FORWARD_COMPAT hint specifies whether the OpenGL
* context should be forward-compatible. * context should be forward-compatible, i.e. one where all functionality
* deprecated in the requested version of OpenGL is removed.
* *
* The @ref GLFW_OPENGL_DEBUG_CONTEXT hint specifies whether to create a debug * The @ref GLFW_OPENGL_DEBUG_CONTEXT hint specifies whether to create a debug
* OpenGL context. * OpenGL context, which may have additional error and performance issue
* reporting functionality.
* *
* The @ref GLFW_OPENGL_PROFILE hint specifies which OpenGL profile to create * The @ref GLFW_OPENGL_PROFILE hint specifies which OpenGL profile to create
* the context for. Possible values are @ref GLFW_OPENGL_NO_PROFILE, @ref * the context for. Possible values are @ref GLFW_OPENGL_NO_PROFILE, @ref

2
src/win32_joystick.c
View File

@ -30,6 +30,8 @@
#include "internal.h" #include "internal.h"
#include <stdlib.h>
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
////// GLFW internal API ////// ////// GLFW internal API //////