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

Moved from gl3.h to glcorearb.h.

Browse Source
This commit is contained in:
Camilla Berglund 2012-09-27 22:28:04 +02:00
parent fe0cc512a2
commit 410a4e29e1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/GL/glfw3.h
View File

@ -141,7 +141,7 @@ extern "C" {
/* Include the chosen OpenGL header and, optionally, the GLU header. /* Include the chosen OpenGL header and, optionally, the GLU header.
*/ */
#if defined(__APPLE_CC__) #if defined(__APPLE_CC__)
#if defined(GLFW_INCLUDE_GL3) #if defined(GLFW_INCLUDE_GLCOREARB)
#include <OpenGL/gl3.h> #include <OpenGL/gl3.h>
#else #else
#define GL_GLEXT_LEGACY #define GL_GLEXT_LEGACY
@ -151,8 +151,8 @@ extern "C" {
#include <OpenGL/glu.h> #include <OpenGL/glu.h>
#endif #endif
#else #else
#if defined(GLFW_INCLUDE_GL3) #if defined(GLFW_INCLUDE_GLCOREARB)
#include <GL3/gl3.h> #include <GL/glcorearb.h>
#else #else
#include <GL/gl.h> #include <GL/gl.h>
#endif #endif

2
readme.html
View File

@ -282,7 +282,7 @@ version of GLFW.</p>
<li>Added <code>GLFW_OPENGL_ES2_PROFILE</code> profile for creating OpenGL ES 2.0 contexts using the <code>GLX_EXT_create_context_es2_profile</code> and <code>WGL_EXT_create_context_es2_profile</code> extensions</li> <li>Added <code>GLFW_OPENGL_ES2_PROFILE</code> profile for creating OpenGL ES 2.0 contexts using the <code>GLX_EXT_create_context_es2_profile</code> and <code>WGL_EXT_create_context_es2_profile</code> extensions</li>
<li>Added <code>GLFW_OPENGL_ROBUSTNESS</code> window hint and associated strategy tokens for <code>GL_ARB_robustness</code> support</li> <li>Added <code>GLFW_OPENGL_ROBUSTNESS</code> window hint and associated strategy tokens for <code>GL_ARB_robustness</code> support</li>
<li>Added <code>GLFW_OPENGL_REVISION</code> window parameter to make up for removal of <code>glfwGetGLVersion</code></li> <li>Added <code>GLFW_OPENGL_REVISION</code> window parameter to make up for removal of <code>glfwGetGLVersion</code></li>
<li>Added <code>GLFW_INCLUDE_GL3</code> macro for telling the GLFW header to include <code>gl3.h</code> header instead of <code>gl.h</code></li> <li>Added <code>GLFW_INCLUDE_GLCOREARB</code> macro for including <code>glcorearb.h</code> instead of <code>gl.h</code></li>
<li>Added <code>GLFW_VISIBLE</code> window hint and parameter for controlling and polling window visibility</li> <li>Added <code>GLFW_VISIBLE</code> window hint and parameter for controlling and polling window visibility</li>
<li>Added <code>windows</code> simple multi-window test program</li> <li>Added <code>windows</code> simple multi-window test program</li>
<li>Added <code>sharing</code> simple OpenGL object sharing test program</li> <li>Added <code>sharing</code> simple OpenGL object sharing test program</li>