From dddf8724bef7b9f86475710d49f08fef9c45277b Mon Sep 17 00:00:00 2001 From: Tuetuopay Date: Sat, 9 Dec 2017 22:14:43 +0100 Subject: [PATCH] [GLES] Include proper `glext` header with GL ES 3.x When using OpenGL ES 3.x headers, setting the `GLFW_INCLUDE_GLEXT` macro would include `GLES2/gl2ext.h` instead of the version 3 (`GLES3/gl3ext.h`). --- README.md | 1 + include/GLFW/glfw3.h | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 638d956f0..5823a57f6 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/include/GLFW/glfw3.h b/include/GLFW/glfw3.h index 07f8b172e..f72892a3d 100644 --- a/include/GLFW/glfw3.h +++ b/include/GLFW/glfw3.h @@ -153,21 +153,21 @@ extern "C" { #include #if defined(GLFW_INCLUDE_GLEXT) - #include + #include #endif #elif defined(GLFW_INCLUDE_ES31) #include #if defined(GLFW_INCLUDE_GLEXT) - #include + #include #endif #elif defined(GLFW_INCLUDE_ES32) #include #if defined(GLFW_INCLUDE_GLEXT) - #include + #include #endif #elif defined(GLFW_INCLUDE_GLCOREARB)