diff --git a/README.md b/README.md index b79a84e8..74fbc34c 100644 --- a/README.md +++ b/README.md @@ -112,6 +112,7 @@ information on what to include when reporting a bug. - Added definition of `GLAPIENTRY` to public header - Added macOS specific `GLFW_COCOA_RETINA_FRAMEBUFFER` window hint - Added macOS specific `GLFW_COCOA_FRAME_AUTOSAVE` window hint (#195) +- Added `GLFW_INCLUDE_ES32` for including the OpenGL ES 3.2 header - Removed `GLFW_USE_RETINA` compile-time option - Bugfix: Calling `glfwMaximizeWindow` on a full screen window was not ignored - Bugfix: `GLFW_INCLUDE_VULKAN` could not be combined with the corresponding diff --git a/docs/build.dox b/docs/build.dox index c1584e41..8b5a0a64 100644 --- a/docs/build.dox +++ b/docs/build.dox @@ -86,6 +86,10 @@ __GLFW_INCLUDE_ES3__ makes the GLFW header include the OpenGL ES 3.0 __GLFW_INCLUDE_ES31__ makes the GLFW header include the OpenGL ES 3.1 `GLES3/gl31.h` header instead of the regular OpenGL header. +@anchor GLFW_INCLUDE_ES32 +__GLFW_INCLUDE_ES31__ makes the GLFW header include the OpenGL ES 3.2 +`GLES3/gl32.h` header instead of the regular OpenGL header. + @anchor GLFW_INCLUDE_NONE __GLFW_INCLUDE_NONE__ makes the GLFW header not include any OpenGL or OpenGL ES API header. This is useful in combination with an extension loading library. diff --git a/include/GLFW/glfw3.h b/include/GLFW/glfw3.h index c27e20bb..4be29de9 100644 --- a/include/GLFW/glfw3.h +++ b/include/GLFW/glfw3.h @@ -171,6 +171,11 @@ extern "C" { #if defined(GLFW_INCLUDE_GLEXT) #include #endif + #elif defined(GLFW_INCLUDE_ES32) + #include + #if defined(GLFW_INCLUDE_GLEXT) + #include + #endif #elif !defined(GLFW_INCLUDE_NONE) #include #if defined(GLFW_INCLUDE_GLEXT) diff --git a/src/internal.h b/src/internal.h index 5c52cdf1..50f1b4c5 100644 --- a/src/internal.h +++ b/src/internal.h @@ -37,6 +37,8 @@ defined(GLFW_INCLUDE_ES1) || \ defined(GLFW_INCLUDE_ES2) || \ defined(GLFW_INCLUDE_ES3) || \ + defined(GLFW_INCLUDE_ES31) || \ + defined(GLFW_INCLUDE_ES32) || \ defined(GLFW_INCLUDE_NONE) || \ defined(GLFW_INCLUDE_GLEXT) || \ defined(GLFW_INCLUDE_GLU) || \