Browse Source

Add GLFW_INCLUDE_ES32

Camilla Löwy 8 years ago
parent
commit
3edaa5280d
4 changed files with 12 additions and 0 deletions
  1. 1 0
      README.md
  2. 4 0
      docs/build.dox
  3. 5 0
      include/GLFW/glfw3.h
  4. 2 0
      src/internal.h

+ 1 - 0
README.md

@@ -112,6 +112,7 @@ information on what to include when reporting a bug.
 - Added definition of `GLAPIENTRY` to public header
 - Added definition of `GLAPIENTRY` to public header
 - Added macOS specific `GLFW_COCOA_RETINA_FRAMEBUFFER` window hint
 - Added macOS specific `GLFW_COCOA_RETINA_FRAMEBUFFER` window hint
 - Added macOS specific `GLFW_COCOA_FRAME_AUTOSAVE` window hint (#195)
 - 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
 - Removed `GLFW_USE_RETINA` compile-time option
 - Bugfix: Calling `glfwMaximizeWindow` on a full screen window was not ignored
 - Bugfix: Calling `glfwMaximizeWindow` on a full screen window was not ignored
 - Bugfix: `GLFW_INCLUDE_VULKAN` could not be combined with the corresponding
 - Bugfix: `GLFW_INCLUDE_VULKAN` could not be combined with the corresponding

+ 4 - 0
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
 __GLFW_INCLUDE_ES31__ makes the GLFW header include the OpenGL ES 3.1
 `GLES3/gl31.h` header instead of the regular OpenGL header.
 `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
 @anchor GLFW_INCLUDE_NONE
 __GLFW_INCLUDE_NONE__ makes the GLFW header not include any OpenGL or OpenGL ES
 __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.
 API header.  This is useful in combination with an extension loading library.

+ 5 - 0
include/GLFW/glfw3.h

@@ -171,6 +171,11 @@ extern "C" {
   #if defined(GLFW_INCLUDE_GLEXT)
   #if defined(GLFW_INCLUDE_GLEXT)
    #include <GLES2/gl2ext.h>
    #include <GLES2/gl2ext.h>
   #endif
   #endif
+ #elif defined(GLFW_INCLUDE_ES32)
+  #include <GLES3/gl32.h>
+  #if defined(GLFW_INCLUDE_GLEXT)
+   #include <GLES2/gl2ext.h>
+  #endif
  #elif !defined(GLFW_INCLUDE_NONE)
  #elif !defined(GLFW_INCLUDE_NONE)
   #include <GL/gl.h>
   #include <GL/gl.h>
   #if defined(GLFW_INCLUDE_GLEXT)
   #if defined(GLFW_INCLUDE_GLEXT)

+ 2 - 0
src/internal.h

@@ -37,6 +37,8 @@
     defined(GLFW_INCLUDE_ES1)       || \
     defined(GLFW_INCLUDE_ES1)       || \
     defined(GLFW_INCLUDE_ES2)       || \
     defined(GLFW_INCLUDE_ES2)       || \
     defined(GLFW_INCLUDE_ES3)       || \
     defined(GLFW_INCLUDE_ES3)       || \
+    defined(GLFW_INCLUDE_ES31)      || \
+    defined(GLFW_INCLUDE_ES32)      || \
     defined(GLFW_INCLUDE_NONE)      || \
     defined(GLFW_INCLUDE_NONE)      || \
     defined(GLFW_INCLUDE_GLEXT)     || \
     defined(GLFW_INCLUDE_GLEXT)     || \
     defined(GLFW_INCLUDE_GLU)       || \
     defined(GLFW_INCLUDE_GLU)       || \