Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-10-04 13:46:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge dddf8724be into 682f1cf203

Browse Source
This commit is contained in:
Tuetuopay 2017-12-09 21:16:31 +00:00 committed by GitHub
commit 851446a592
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -124,6 +124,7 @@ information on what to include when reporting a bug.
## Changelog
- [GLES] Include proper `glext` headers when required with OpenGL ES 3.x
- Added `glfwGetError` function for querying the last error code and its
description (#970)
- Added `glfwUpdateGamepadMappings` function for importing gamepad mappings in

6
include/GLFW/glfw3.h
View File

@ -153,21 +153,21 @@ extern "C" {
#include <GLES3/gl3.h>
#if defined(GLFW_INCLUDE_GLEXT)
#include <GLES2/gl2ext.h>
#include <GLES3/gl3ext.h>
#endif
#elif defined(GLFW_INCLUDE_ES31)
#include <GLES3/gl31.h>
#if defined(GLFW_INCLUDE_GLEXT)
#include <GLES2/gl2ext.h>
#include <GLES3/gl3ext.h>
#endif
#elif defined(GLFW_INCLUDE_ES32)
#include <GLES3/gl32.h>
#if defined(GLFW_INCLUDE_GLEXT)
#include <GLES2/gl2ext.h>
#include <GLES3/gl3ext.h>
#endif
#elif defined(GLFW_INCLUDE_GLCOREARB)