diff options
author | Sven Gothel <[email protected]> | 2015-03-06 09:45:48 +0100 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2015-03-06 09:45:48 +0100 |
commit | 0d59bd4c655ef9a27f127000848aae7f07f240ae (patch) | |
tree | 3ac18e10e105ad70227bbb2205294ac3e6462c0e /make/stub_includes/opengl | |
parent | 0674a3678d747335ad36f0f57e3bdc9c168f0dcf (diff) |
Bug 1135 - Change all GlueGen config files, supporting EGL 1.5 , ES 3.1 and GL 4.5
Diffstat (limited to 'make/stub_includes/opengl')
-rw-r--r-- | make/stub_includes/opengl/gl2.c | 1 | ||||
-rw-r--r-- | make/stub_includes/opengl/gl3bc.c | 1 | ||||
-rw-r--r-- | make/stub_includes/opengl/gl4bc.c | 1 | ||||
-rw-r--r-- | make/stub_includes/opengl/gles1.c | 1 | ||||
-rw-r--r-- | make/stub_includes/opengl/gles2.c | 4 | ||||
-rw-r--r-- | make/stub_includes/opengl/gles3.c | 8 |
6 files changed, 12 insertions, 4 deletions
diff --git a/make/stub_includes/opengl/gl2.c b/make/stub_includes/opengl/gl2.c index 1d2a67ae7..037d67d0b 100644 --- a/make/stub_includes/opengl/gl2.c +++ b/make/stub_includes/opengl/gl2.c @@ -4,5 +4,6 @@ // "glext.h" are parsed. #define GL_GLEXT_PROTOTYPES +#include <GL/glext-supplement.h> #include <GL/gl.h> #include <GL/glext.h> diff --git a/make/stub_includes/opengl/gl3bc.c b/make/stub_includes/opengl/gl3bc.c index a40fe13c1..81f7a50d6 100644 --- a/make/stub_includes/opengl/gl3bc.c +++ b/make/stub_includes/opengl/gl3bc.c @@ -3,6 +3,7 @@ // Define GL_GLEXT_PROTOTYPES so that the OpenGL extension prototypes are parsed. #define GL_GLEXT_PROTOTYPES +#include <GL/glext-supplement.h> #include <GL/gl.h> #include <GL/glext.h> diff --git a/make/stub_includes/opengl/gl4bc.c b/make/stub_includes/opengl/gl4bc.c index a40fe13c1..81f7a50d6 100644 --- a/make/stub_includes/opengl/gl4bc.c +++ b/make/stub_includes/opengl/gl4bc.c @@ -3,6 +3,7 @@ // Define GL_GLEXT_PROTOTYPES so that the OpenGL extension prototypes are parsed. #define GL_GLEXT_PROTOTYPES +#include <GL/glext-supplement.h> #include <GL/gl.h> #include <GL/glext.h> diff --git a/make/stub_includes/opengl/gles1.c b/make/stub_includes/opengl/gles1.c index ff6056ce8..f8ae02f44 100644 --- a/make/stub_includes/opengl/gles1.c +++ b/make/stub_includes/opengl/gles1.c @@ -5,5 +5,6 @@ // "glext.h" are parsed. #define GL_GLEXT_PROTOTYPES +#include <GLES/glext-supplement.h> #include <GLES/gl.h> #include <GLES/glext.h> diff --git a/make/stub_includes/opengl/gles2.c b/make/stub_includes/opengl/gles2.c index cbc5cf847..a1e108803 100644 --- a/make/stub_includes/opengl/gles2.c +++ b/make/stub_includes/opengl/gles2.c @@ -2,8 +2,10 @@ #define GL_APIENTRY // Define GL_GLEXT_PROTOTYPES so that the OpenGL extension prototypes in -// "glext.h" are parsed. +// "gl2ext.h" are parsed. #define GL_GLEXT_PROTOTYPES +#include <GLES2/gl2ext-supplement.h> #include <GLES2/gl2.h> #include <GLES2/gl2ext.h> + diff --git a/make/stub_includes/opengl/gles3.c b/make/stub_includes/opengl/gles3.c index 3d2ad8c75..437d61a60 100644 --- a/make/stub_includes/opengl/gles3.c +++ b/make/stub_includes/opengl/gles3.c @@ -2,11 +2,13 @@ #define GL_APIENTRY // Define GL_GLEXT_PROTOTYPES so that the OpenGL extension prototypes in -// "glext.h" are parsed. +// "gl2ext.h" and "gl3ext.h" are parsed. #define GL_GLEXT_PROTOTYPES -#include <GLES3/gl3.h> +#include <GLES3/gl31.h> #include <GLES3/gl3ext.h> -/** We assume ES2 extensions maybe avail on ES3 .. */ +/** Shared between ES2 and ES3 .. */ +#include <GLES2/gl2ext-supplement.h> #include <GLES2/gl2ext.h> + |