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

Added GLFW_INCLUDE_ES31.

Browse Source 
Fixes #255.
This commit is contained in:
Camilla Berglund 2014-03-19 23:01:20 +01:00
parent 8ebd135536
commit 7ebd10a868
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -47,12 +47,13 @@ The following dependencies are needed by the examples and test programs:
- Added native monitor handle access to native API - Added native monitor handle access to native API
- Added `glfwSetDropCallback` and `GLFWdropfun` for receiving dropped files - Added `glfwSetDropCallback` and `GLFWdropfun` for receiving dropped files
- Added `glfwPostEmptyEvent` for allowing secondary threads to cause
- Added `empty` test program for verifying posting of empty events - Added `empty` test program for verifying posting of empty events
- Added `GLFW_INCLUDE_ES31` for including the OpenGL ES 3.1 header
- Bugfix: The debug context attribute was set from `GL_ARB_debug_output` even - Bugfix: The debug context attribute was set from `GL_ARB_debug_output` even
when a debug context had not been requested when a debug context had not been requested
- Bugfix: The particles example was not linked against the threading library - Bugfix: The particles example was not linked against the threading library
- Added `glfwPostEmptyEvent` for allowing secondary threads to cause `glfwWaitEvents` to return
`glfwWaitEvents` to return
- [Cocoa] Added `_GLFW_USE_RETINA` to control whether windows will use the full - [Cocoa] Added `_GLFW_USE_RETINA` to control whether windows will use the full
resolution on Retina displays resolution on Retina displays
- [Cocoa] Bugfix: Using a 1x1 cursor for hidden mode caused some screen - [Cocoa] Bugfix: Using a 1x1 cursor for hidden mode caused some screen

2
include/GLFW/glfw3.h
View File

@ -158,6 +158,8 @@ extern "C" {
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#elif defined(GLFW_INCLUDE_ES3) #elif defined(GLFW_INCLUDE_ES3)
#include <GLES3/gl3.h> #include <GLES3/gl3.h>
#elif defined(GLFW_INCLUDE_ES31)
#include <GLES3/gl31.h>
#elif !defined(GLFW_INCLUDE_NONE) #elif !defined(GLFW_INCLUDE_NONE)
#include <GL/gl.h> #include <GL/gl.h>
#endif #endif