diff options
| author | Sven Gothel <[email protected]> | 2015-03-09 08:57:24 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2015-03-09 08:57:24 +0100 |
| commit | 99d37df6cf410117cb8d49774ef7550bcf847c7b (patch) | |
| tree | e0a8b810dfee33f0ff570bc9e9e3e80115935c96 /make/stub_includes/x11 | |
| parent | e3385993b4133f88fd1b8e335438f5f2cd305555 (diff) | |
Bug 1135 - (Re-)Include GL header for in generated native code, allowing 'ProcAddrTypedef' validation
Include GL header for in generated native code,
since we need the public 'ProcAddrTypedef' to be validated
against the GlueGen generated variant by the c-compiler.
The 'ProcAddrTypedef' validation semantic has been
introduced in GlueGen w/ commit 10060b091b76bee35246c5165d49ab546ebc4e37.
Originally the GL header were always included,
however, JOGL commit 0d59bd4c655ef9a27f127000848aae7f07f240ae
removed the inclusion to simplify handling GL extension collisions
mitigated via gl*-supplement.h. The latter produces 'redefine'
errors via c-compiler.
The 'redefine' issue above is resolved
by conditional code (#ifdef __GLUEGEN__ ..)
in glext-supplement.h.
Diffstat (limited to 'make/stub_includes/x11')
| -rw-r--r-- | make/stub_includes/x11/glxext.c | 15 | ||||
| -rw-r--r-- | make/stub_includes/x11/window-system1.c | 15 |
2 files changed, 22 insertions, 8 deletions
diff --git a/make/stub_includes/x11/glxext.c b/make/stub_includes/x11/glxext.c index e781b6e88..35ed63b5b 100644 --- a/make/stub_includes/x11/glxext.c +++ b/make/stub_includes/x11/glxext.c @@ -4,14 +4,21 @@ #define _Xconst const #endif /* _Xconst */ +#include <GL/gl-platform.h> + +#include <X11/Xlib.h> +#include <X11/Xutil.h> + // Define GL_GLEXT_PROTOTYPES so that the OpenGL GLX extension prototypes in // "glx.h" are parsed. -#define GL_GLEXT_PROTOTYPES +// #define GL_GLEXT_PROTOTYPES +// #include <GL/gl.h> +// #include <GL/glext-supplement.h> +// #include <GL/glext.h> +#include <gl-types.h> // Define GLX_GLXEXT_PROTOTYPES so that the OpenGL GLX extension prototypes in // "glxext.h" are parsed. #define GLX_GLXEXT_PROTOTYPES -#include <X11/Xlib.h> -#include <X11/Xutil.h> #include <GL/glx.h> -// GL/glxext.h included by GL/glx.h +#include <GL/glxext.h> diff --git a/make/stub_includes/x11/window-system1.c b/make/stub_includes/x11/window-system1.c index e781b6e88..35ed63b5b 100644 --- a/make/stub_includes/x11/window-system1.c +++ b/make/stub_includes/x11/window-system1.c @@ -4,14 +4,21 @@ #define _Xconst const #endif /* _Xconst */ +#include <GL/gl-platform.h> + +#include <X11/Xlib.h> +#include <X11/Xutil.h> + // Define GL_GLEXT_PROTOTYPES so that the OpenGL GLX extension prototypes in // "glx.h" are parsed. -#define GL_GLEXT_PROTOTYPES +// #define GL_GLEXT_PROTOTYPES +// #include <GL/gl.h> +// #include <GL/glext-supplement.h> +// #include <GL/glext.h> +#include <gl-types.h> // Define GLX_GLXEXT_PROTOTYPES so that the OpenGL GLX extension prototypes in // "glxext.h" are parsed. #define GLX_GLXEXT_PROTOTYPES -#include <X11/Xlib.h> -#include <X11/Xutil.h> #include <GL/glx.h> -// GL/glxext.h included by GL/glx.h +#include <GL/glxext.h> |