diff options
| author | Sven Gothel <[email protected]> | 2015-03-05 04:42:43 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2015-03-05 04:42:43 +0100 |
| commit | 47713518e3317b2621ee7ff1bbf8223fbce7fdc4 (patch) | |
| tree | 26714f86a19721bb9eb0aade9cee4bd16c67ce66 /make/stub_includes/opengl/GL | |
| parent | 6b05c6919f3df20ce0b55d5ac7dda7b14068568e (diff) | |
Bug 1135 - Support EGL 1.5 , ES 3.1 and GL 4.5 - Part 2: Minimal patch of vanilla GL headers
New vanilla GL headers were dropped w/ commit 6b05c6919f3df20ce0b55d5ac7dda7b14068568e.
- egl/EGL/eglplatform.h: 2013-10-09 +generic void pointer for EGLNative*Type
- khr/KHR/khrplatform.h: 2013-09-30 +using 'our' GlueGen stdint types, hence reduced
- GL/glcorearb.h: 2015-02-02 +using 'our' stdint- and platform types
- GL/glext.h: 2015-02-02 +using 'our' stdint- and platform types
Diffstat (limited to 'make/stub_includes/opengl/GL')
| -rw-r--r-- | make/stub_includes/opengl/GL/glcorearb.h | 19 | ||||
| -rw-r--r-- | make/stub_includes/opengl/GL/glext.h | 19 |
2 files changed, 6 insertions, 32 deletions
diff --git a/make/stub_includes/opengl/GL/glcorearb.h b/make/stub_includes/opengl/GL/glcorearb.h index a8c912f68..238dc6818 100644 --- a/make/stub_includes/opengl/GL/glcorearb.h +++ b/make/stub_includes/opengl/GL/glcorearb.h @@ -36,22 +36,9 @@ extern "C" { ** Khronos $Revision: 29735 $ on $Date: 2015-02-02 19:00:01 -0800 (Mon, 02 Feb 2015) $ */ -#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN 1 -#endif -#include <windows.h> -#endif - -#ifndef APIENTRY -#define APIENTRY -#endif -#ifndef APIENTRYP -#define APIENTRYP APIENTRY * -#endif -#ifndef GLAPI -#define GLAPI extern -#endif +/* Function declaration macros - to move into gl-platform.h */ +#include "gl-platform.h" +#include "gl-types.h" /* glcorearb.h is for use with OpenGL core profile implementations. ** It should should be placed in the same directory as gl.h and diff --git a/make/stub_includes/opengl/GL/glext.h b/make/stub_includes/opengl/GL/glext.h index a3873a613..056abbd93 100644 --- a/make/stub_includes/opengl/GL/glext.h +++ b/make/stub_includes/opengl/GL/glext.h @@ -36,22 +36,9 @@ extern "C" { ** Khronos $Revision: 29735 $ on $Date: 2015-02-02 19:00:01 -0800 (Mon, 02 Feb 2015) $ */ -#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN 1 -#endif -#include <windows.h> -#endif - -#ifndef APIENTRY -#define APIENTRY -#endif -#ifndef APIENTRYP -#define APIENTRYP APIENTRY * -#endif -#ifndef GLAPI -#define GLAPI extern -#endif +/* Function declaration macros - to move into gl-platform.h */ +#include "gl-platform.h" +#include "gl-types.h" #define GL_GLEXT_VERSION 20150202 |