diff options
Diffstat (limited to 'make/config')
26 files changed, 76 insertions, 51 deletions
diff --git a/make/config/jogl/es1-headers.cfg b/make/config/jogl/es1-headers.cfg index e01d40498..6dc3696c3 100644 --- a/make/config/jogl/es1-headers.cfg +++ b/make/config/jogl/es1-headers.cfg @@ -1,5 +1,9 @@ CustomCCode #include <stdio.h> /* android */ CustomCCode #include <GLES/glplatform.h> -CustomCCode #include <gl-types.h> +CustomCCode // Define GL_GLEXT_PROTOTYPES so that the OpenGL extension prototypes in +CustomCCode // "glext.h" are parsed. +CustomCCode #define GL_GLEXT_PROTOTYPES +CustomCCode #include <GLES/gl.h> +CustomCCode #include <GLES/glext.h> +CustomCCode #include <GLES/glext-supplement.h> CustomCCode #include <stdlib.h> - diff --git a/make/config/jogl/es3-headers.cfg b/make/config/jogl/es3-headers.cfg index bdf19fa4a..41f6d5a6b 100644 --- a/make/config/jogl/es3-headers.cfg +++ b/make/config/jogl/es3-headers.cfg @@ -1,4 +1,11 @@ CustomCCode #include <stdio.h> /* android */ CustomCCode #include <GLES2/gl2platform.h> -CustomCCode #include <gl-types.h> +CustomCCode // Define GL_GLEXT_PROTOTYPES so that the OpenGL extension prototypes in +CustomCCode // "gl2ext.h" and "gl3ext.h" are parsed. +CustomCCode #define GL_GLEXT_PROTOTYPES +CustomCCode #include <GLES3/gl31.h> +CustomCCode #include <GLES3/gl3ext.h> +CustomCCode /** Shared between ES2 and ES3 .. */ +CustomCCode #include <GLES2/gl2ext.h> +CustomCCode #include <GLES2/gl2ext-supplement.h> CustomCCode #include <stdlib.h> diff --git a/make/config/jogl/gl-common.cfg b/make/config/jogl/gl-common.cfg index b881ce4d0..1711d962e 100644 --- a/make/config/jogl/gl-common.cfg +++ b/make/config/jogl/gl-common.cfg @@ -17,17 +17,17 @@ RelaxedEqualSemanticsTest true # Inform the glue code generator of the association between #defines # and functions and the extensions in which they are defined # _for_ API documentation only! -GLDocHeader GL/glext-supplement.h GLDocHeader GL/gl.h +GLDocHeader GL/glext-supplement.h GLDocHeader GL/glext-20130207.h GLDocHeader GL/glext.h GLDocHeader GL/glcorearb.h GLDocHeader GL/glcorearbext.h -GLDocHeader GLES/glext-supplement.h GLDocHeader GLES/gl.h +GLDocHeader GLES/glext-supplement.h GLDocHeader GLES/glext.h -GLDocHeader GLES2/gl2ext-supplement.h GLDocHeader GLES2/gl2.h +GLDocHeader GLES2/gl2ext-supplement.h GLDocHeader GLES2/gl2ext.h GLDocHeader GLES3/gl31.h GLDocHeader GLES3/gl3ext.h diff --git a/make/config/jogl/gl-es1.cfg b/make/config/jogl/gl-es1.cfg index 98d892247..6ce59770e 100644 --- a/make/config/jogl/gl-es1.cfg +++ b/make/config/jogl/gl-es1.cfg @@ -5,8 +5,8 @@ NativeOutputDir gensrc/native/jogl/es1 # Inform the glue code generator of the association between #defines # and functions and the extensions in which they are defined # _for_ code generation. This shall match the parsed header files! -GLSemHeader GLES/glext-supplement.h GLSemHeader GLES/gl.h +GLSemHeader GLES/glext-supplement.h GLSemHeader GLES/glext.h ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL.java diff --git a/make/config/jogl/gl-es3-impl.cfg b/make/config/jogl/gl-es3-impl.cfg index 443f91c1c..01ef034f6 100644 --- a/make/config/jogl/gl-es3-impl.cfg +++ b/make/config/jogl/gl-es3-impl.cfg @@ -5,9 +5,9 @@ NativeOutputDir gensrc/native/jogl/es3 # Inform the glue code generator of the association between #defines # and functions and the extensions in which they are defined # _for_ code generation. This shall match the parsed header files! -GLSemHeader GLES2/gl2ext-supplement.h GLSemHeader GLES3/gl31.h GLSemHeader GLES3/gl3ext.h +GLSemHeader GLES2/gl2ext-supplement.h GLSemHeader GLES2/gl2ext.h ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL.java diff --git a/make/config/jogl/gl-gl4bc.cfg b/make/config/jogl/gl-gl4bc.cfg index 034faa59e..ae3ebb22f 100644 --- a/make/config/jogl/gl-gl4bc.cfg +++ b/make/config/jogl/gl-gl4bc.cfg @@ -5,8 +5,8 @@ NativeOutputDir gensrc/native/jogl/gl4 # Inform the glue code generator of the association between #defines # and functions and the extensions in which they are defined # _for_ code generation. This shall match the parsed header files! -GLSemHeader GL/glext-supplement.h GLSemHeader GL/gl.h +GLSemHeader GL/glext-supplement.h GLSemHeader GL/glext-20130207.h GLSemHeader GL/glext.h GLSemHeader GL/glcorearb.h diff --git a/make/config/jogl/gl-headers.cfg b/make/config/jogl/gl-headers.cfg index 3692cd804..7a5315ebb 100644 --- a/make/config/jogl/gl-headers.cfg +++ b/make/config/jogl/gl-headers.cfg @@ -1,13 +1,23 @@ CustomCCode #include <stdio.h> /* android */ CustomCCode #include <GL/gl-platform.h> -CustomCCode #include <gl-types.h> +CustomCCode // Define GL_GLEXT_PROTOTYPES so that the OpenGL extension prototypes in +CustomCCode // "glext.h" are parsed. +CustomCCode #define GL_GLEXT_PROTOTYPES CustomCCode #if defined(_WIN32) CustomCCode #include <stdlib.h> CustomCCode #include <stddef.h> CustomCCode #include <malloc.h> +CustomCCode /* Include the OpenGL headers */ +CustomCCode #include <GL/gl.h> +CustomCCode #include <GL/glext.h> +CustomCCode #include <GL/glext-supplement.h> CustomCCode #elif defined(__APPLE__) CustomCCode #include <inttypes.h> CustomCCode #include <stdlib.h> +CustomCCode /* Include the OpenGL headers */ +CustomCCode #include <GL/gl.h> +CustomCCode #include <GL/glext.h> +CustomCCode #include <GL/glext-supplement.h> CustomCCode #include <machine/types.h> CustomCCode /* Provide Windows typedefs */ CustomCCode typedef void* LPVOID; @@ -16,6 +26,10 @@ CustomCCode #elif defined(__unix__) CustomCCode #include <inttypes.h> CustomCCode #include <stdlib.h> CustomCCode #include <X11/Xlib.h> +CustomCCode /* Include the OpenGL headers */ +CustomCCode #include <GL/gl.h> +CustomCCode #include <GL/glext.h> +CustomCCode #include <GL/glext-supplement.h> CustomCCode /* Provide Windows typedefs */ CustomCCode typedef void* LPVOID; CustomCCode typedef unsigned int* PUINT; diff --git a/make/config/jogl/gl-if-es2.cfg b/make/config/jogl/gl-if-es2.cfg index 49b1973cc..4199f2069 100644 --- a/make/config/jogl/gl-if-es2.cfg +++ b/make/config/jogl/gl-if-es2.cfg @@ -5,8 +5,8 @@ NativeOutputDir gensrc/native/jogl/es2 # Inform the glue code generator of the association between #defines # and functions and the extensions in which they are defined # _for_ code generation. This shall match the parsed header files! -GLSemHeader GLES2/gl2ext-supplement.h GLSemHeader GLES2/gl2.h +GLSemHeader GLES2/gl2ext-supplement.h GLSemHeader GLES2/gl2ext.h ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL.java diff --git a/make/config/jogl/gl-if-es3.cfg b/make/config/jogl/gl-if-es3.cfg index cf56e9f0d..573a79f85 100644 --- a/make/config/jogl/gl-if-es3.cfg +++ b/make/config/jogl/gl-if-es3.cfg @@ -4,8 +4,8 @@ JavaOutputDir gensrc/classes # Inform the glue code generator of the association between #defines # and functions and the extensions in which they are defined # _for_ code generation. This shall match the parsed header files! -GLSemHeader GLES2/gl2ext-supplement.h GLSemHeader GLES3/gl31.h +GLSemHeader GLES2/gl2ext-supplement.h GLSemHeader GLES3/gl3ext.h GLSemHeader GLES2/gl2ext.h diff --git a/make/config/jogl/gl-if-gl.cfg b/make/config/jogl/gl-if-gl.cfg index 8716e5cdd..c9f93d35d 100644 --- a/make/config/jogl/gl-if-gl.cfg +++ b/make/config/jogl/gl-if-gl.cfg @@ -7,8 +7,8 @@ Extends GL GLBase # Inform the glue code generator of the association between #defines # and functions and the extensions in which they are defined # _for_ code generation. This shall match the parsed header files! -GLSemHeader GLES2/gl2ext-supplement.h GLSemHeader GLES2/gl2.h +GLSemHeader GLES2/gl2ext-supplement.h GLSemHeader GLES2/gl2ext.h ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/GLBase.java diff --git a/make/config/jogl/gl-if-gl2.cfg b/make/config/jogl/gl-if-gl2.cfg index bff2e5fed..e539633ad 100644 --- a/make/config/jogl/gl-if-gl2.cfg +++ b/make/config/jogl/gl-if-gl2.cfg @@ -5,8 +5,8 @@ NativeOutputDir gensrc/native/jogl/gl2 # Inform the glue code generator of the association between #defines # and functions and the extensions in which they are defined # _for_ code generation. This shall match the parsed header files! -GLSemHeader GL/glext-supplement.h GLSemHeader GL/gl.h +GLSemHeader GL/glext-supplement.h GLSemHeader GL/glext-20130207.h GLSemHeader GL/glext.h diff --git a/make/config/jogl/gl-if-gl2_es1.cfg b/make/config/jogl/gl-if-gl2_es1.cfg index 9fb2fbf83..c2484fcb2 100644 --- a/make/config/jogl/gl-if-gl2_es1.cfg +++ b/make/config/jogl/gl-if-gl2_es1.cfg @@ -11,8 +11,8 @@ Extends GL2ES1 GLLightingFunc # Inform the glue code generator of the association between #defines # and functions and the extensions in which they are defined # _for_ code generation. This shall match the parsed header files! -GLSemHeader GLES/glext-supplement.h GLSemHeader GLES/gl.h +GLSemHeader GLES/glext-supplement.h GLSemHeader GLES/glext.h ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL.java diff --git a/make/config/jogl/gl-if-gl2_es2.cfg b/make/config/jogl/gl-if-gl2_es2.cfg index 97adaead1..a7e1dd333 100644 --- a/make/config/jogl/gl-if-gl2_es2.cfg +++ b/make/config/jogl/gl-if-gl2_es2.cfg @@ -5,8 +5,8 @@ NativeOutputDir gensrc/native/jogl # Inform the glue code generator of the association between #defines # and functions and the extensions in which they are defined # _for_ code generation. This shall match the parsed header files! -GLSemHeader GLES2/gl2ext-supplement.h GLSemHeader GLES2/gl2.h +GLSemHeader GLES2/gl2ext-supplement.h GLSemHeader GLES2/gl2ext.h ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL.java diff --git a/make/config/jogl/gl-if-gl2_es3.cfg b/make/config/jogl/gl-if-gl2_es3.cfg index 34032d7b9..ecad4a188 100644 --- a/make/config/jogl/gl-if-gl2_es3.cfg +++ b/make/config/jogl/gl-if-gl2_es3.cfg @@ -5,8 +5,8 @@ NativeOutputDir gensrc/native/jogl # Inform the glue code generator of the association between #defines # and functions and the extensions in which they are defined # _for_ code generation. This shall match the parsed header files! -GLSemHeader GL/glext-supplement.h GLSemHeader GL/gl.h +GLSemHeader GL/glext-supplement.h GLSemHeader GL/glext-20130207.h GLSemHeader GL/glext.h diff --git a/make/config/jogl/gl-if-gl2_gl3.cfg b/make/config/jogl/gl-if-gl2_gl3.cfg index 02142b726..446bf0b6b 100644 --- a/make/config/jogl/gl-if-gl2_gl3.cfg +++ b/make/config/jogl/gl-if-gl2_gl3.cfg @@ -10,8 +10,8 @@ Extends GL2GL3 GL2ES3 # Inform the glue code generator of the association between #defines # and functions and the extensions in which they are defined # _for_ code generation. This shall match the parsed header files! -GLSemHeader GL/glext-supplement.h GLSemHeader GL/gl.h +GLSemHeader GL/glext-supplement.h GLSemHeader GL/glext-20130207.h GLSemHeader GL/glext.h diff --git a/make/config/jogl/gl-if-gl2es3-subset.cfg b/make/config/jogl/gl-if-gl2es3-subset.cfg index 92099249c..f7c46e859 100644 --- a/make/config/jogl/gl-if-gl2es3-subset.cfg +++ b/make/config/jogl/gl-if-gl2es3-subset.cfg @@ -4,9 +4,9 @@ JavaOutputDir ../../build-temp/gluegen-set # Inform the glue code generator of the association between #defines # and functions and the extensions in which they are defined # _for_ code generation. This shall match the parsed header files! -GLSemHeader GLES2/gl2ext-supplement.h GLSemHeader GLES3/gl31.h GLSemHeader GLES3/gl3ext.h +GLSemHeader GLES2/gl2ext-supplement.h GLSemHeader GLES2/gl2ext.h Package com.jogamp.opengl diff --git a/make/config/jogl/gl-if-gl3_es3.cfg b/make/config/jogl/gl-if-gl3_es3.cfg index a66e4897c..86823a3f4 100644 --- a/make/config/jogl/gl-if-gl3_es3.cfg +++ b/make/config/jogl/gl-if-gl3_es3.cfg @@ -5,9 +5,9 @@ NativeOutputDir gensrc/native/jogl # Inform the glue code generator of the association between #defines # and functions and the extensions in which they are defined # _for_ code generation. This shall match the parsed header files! -GLSemHeader GLES2/gl2ext-supplement.h GLSemHeader GLES3/gl31.h GLSemHeader GLES3/gl3ext.h +GLSemHeader GLES2/gl2ext-supplement.h GLSemHeader GLES2/gl2ext.h Package com.jogamp.opengl diff --git a/make/config/jogl/gl-if-gl3bc.cfg b/make/config/jogl/gl-if-gl3bc.cfg index bf31ab3ae..1be0b8bcf 100644 --- a/make/config/jogl/gl-if-gl3bc.cfg +++ b/make/config/jogl/gl-if-gl3bc.cfg @@ -5,8 +5,8 @@ NativeOutputDir gensrc/native/jogl/gl3 # Inform the glue code generator of the association between #defines # and functions and the extensions in which they are defined # _for_ code generation. This shall match the parsed header files! -GLSemHeader GL/glext-supplement.h GLSemHeader GL/gl.h +GLSemHeader GL/glext-supplement.h GLSemHeader GL/glext-20130207.h GLSemHeader GL/glext.h GLSemHeader GL/glcorearb.h diff --git a/make/config/jogl/gl-if-gl4_es3.cfg b/make/config/jogl/gl-if-gl4_es3.cfg index 2b090eb91..776e82921 100644 --- a/make/config/jogl/gl-if-gl4_es3.cfg +++ b/make/config/jogl/gl-if-gl4_es3.cfg @@ -5,9 +5,9 @@ NativeOutputDir gensrc/native/jogl # Inform the glue code generator of the association between #defines # and functions and the extensions in which they are defined # _for_ code generation. This shall match the parsed header files! -GLSemHeader GLES2/gl2ext-supplement.h GLSemHeader GLES3/gl31.h GLSemHeader GLES3/gl3ext.h +GLSemHeader GLES2/gl2ext-supplement.h GLSemHeader GLES2/gl2ext.h Package com.jogamp.opengl diff --git a/make/config/jogl/glu-common.cfg b/make/config/jogl/glu-common.cfg index bc039ee8d..ed80f1133 100644 --- a/make/config/jogl/glu-common.cfg +++ b/make/config/jogl/glu-common.cfg @@ -6,10 +6,6 @@ HierarchicalNativeOutput false # Pick up on-line OpenGL javadoc thanks to user cylab on javagaming.org forums TagNativeBinding true -# Desktop GL and GLES* headers types slightly differ -# but still are compatible related to actual storage size. -RelaxedEqualSemanticsTest true - # # Imports needed by all glue code # diff --git a/make/config/jogl/glx-CustomCCode.c b/make/config/jogl/glx-CustomCCode.c index 7216e5b65..b4b4f5b0a 100644 --- a/make/config/jogl/glx-CustomCCode.c +++ b/make/config/jogl/glx-CustomCCode.c @@ -1,7 +1,3 @@ -#include <inttypes.h> -#include <X11/Xlib.h> -#include <X11/Xutil.h> -#include <GL/glx.h> /* Linux headers don't work properly */ #define __USE_GNU #include <dlfcn.h> diff --git a/make/config/jogl/glx-headers.cfg b/make/config/jogl/glx-headers.cfg index b38881f74..d5d4f5f2d 100644 --- a/make/config/jogl/glx-headers.cfg +++ b/make/config/jogl/glx-headers.cfg @@ -1,40 +1,41 @@ CustomCCode #include <stdio.h> /* android */ -CustomCCode /** Define GL_GLEXT_PROTOTYPES so that the OpenGL extension prototypes are parsed. */ -CustomCCode #define GL_GLEXT_PROTOTYPES +CustomCCode #include <GL/gl-platform.h> CustomCCode #if defined(_WIN32) -CustomCCode #define WIN32_LEAN_AND_MEAN -CustomCCode #include <windows.h> -CustomCCode #undef WIN32_LEAN_AND_MEAN CustomCCode #include <stdlib.h> CustomCCode #include <stddef.h> CustomCCode #include <malloc.h> -CustomCCode /* Define WGL_GLEXT_PROTOTYPES so that the OpenGL extension prototypes in +CustomCCode /* Define WGL_WGLEXT_PROTOTYPES so that the OpenGL extension prototypes in CustomCCode "wglext.h" are parsed. */ -CustomCCode #define WGL_GLEXT_PROTOTYPES -CustomCCode /* Include the OpenGL headers */ -CustomCCode #include <GL/gl.h> +CustomCCode #define WGL_WGLEXT_PROTOTYPES +CustomCCode /* included implicit via windows header: #include <wingdi.h> */ +CustomCCode #include <gl-types.h> CustomCCode #include <GL/wglext.h> CustomCCode #elif defined(__APPLE__) CustomCCode #include <inttypes.h> CustomCCode #include <stdlib.h> -CustomCCode #include <machine/types.h> CustomCCode /* Provide Windows typedefs */ CustomCCode typedef void* LPVOID; CustomCCode typedef unsigned int* PUINT; CustomCCode /* Include the OpenGL headers */ CustomCCode #include <GL/gl.h> +CustomCCode #include <GL/glext.h> +CustomCCode #include <GL/glext-supplement.h> +CustomCCode #include <machine/types.h> +CustomCCode /* Provide Windows typedefs */ +CustomCCode typedef void* LPVOID; +CustomCCode typedef unsigned int* PUINT; CustomCCode #elif defined(__unix__) CustomCCode #include <inttypes.h> CustomCCode #include <stdlib.h> CustomCCode #include <X11/Xlib.h> -CustomCCode /* Provide Windows typedefs */ -CustomCCode typedef void* LPVOID; -CustomCCode typedef unsigned int* PUINT; CustomCCode /* Define GLX_GLXEXT_PROTOTYPES so that the OpenGL extension prototypes in CustomCCode "glxext.h" are parsed. */ CustomCCode #define GLX_GLXEXT_PROTOTYPES -CustomCCode #include <GL/gl.h> +CustomCCode #include <gl-types.h> CustomCCode #include <GL/glx.h> CustomCCode #include <GL/glxext.h> +CustomCCode /* Provide Windows typedefs */ +CustomCCode typedef void* LPVOID; +CustomCCode typedef unsigned int* PUINT; CustomCCode #endif diff --git a/make/config/jogl/glx-x11.cfg b/make/config/jogl/glx-x11.cfg index 8a127558f..17b5fa8d7 100644 --- a/make/config/jogl/glx-x11.cfg +++ b/make/config/jogl/glx-x11.cfg @@ -3,6 +3,10 @@ JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/jogl/X11 +#GLSemHeader GL/gl.h +#GLSemHeader GL/glext-supplement.h +#GLSemHeader GL/glext.h +GLSemHeader gl-types.h GLSemHeader GL/glx.h GLSemHeader GL/glxext.h @@ -30,7 +34,10 @@ CustomJavaCode GLX private static GLXProcAddressTable glxProcAddressTable = new CustomJavaCode GLX public static GLXProcAddressTable getGLXProcAddressTable() { return glxProcAddressTable; } IncludeAs CustomJavaCode GLX glx-CustomJavaCode.java + +Include glx-headers.cfg IncludeAs CustomCCode glx-CustomCCode.c + ForceStaticInitCode GLX ArgumentIsString XOpenDisplay 0 diff --git a/make/config/jogl/glxext.cfg b/make/config/jogl/glxext.cfg index 7f3defe15..c6e6d2aa4 100644 --- a/make/config/jogl/glxext.cfg +++ b/make/config/jogl/glxext.cfg @@ -3,6 +3,10 @@ JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/jogl/X11 +#GLSemHeader GL/gl.h +#GLSemHeader GL/glext-supplement.h +#GLSemHeader GL/glext.h +GLSemHeader gl-types.h GLSemHeader GL/glx.h GLSemHeader GL/glxext.h diff --git a/make/config/jogl/wgl-win32.cfg b/make/config/jogl/wgl-win32.cfg index c5c6db0db..b3db05cec 100644 --- a/make/config/jogl/wgl-win32.cfg +++ b/make/config/jogl/wgl-win32.cfg @@ -13,6 +13,7 @@ Include gl-common-extensions.cfg Include gl-desktop.cfg GLSemHeader wingdi.h +GLSemHeader gl-types.h GLSemHeader GL/wglext.h ForceProcAddressGen __ALL__ @@ -39,12 +40,7 @@ CustomJavaCode WGL public static WGLProcAddressTable getWGLProcAddressTable() { # of byte[] ArgumentIsString wglGetProcAddress 0 -CustomCCode #define WIN32_LEAN_AND_MEAN -CustomCCode #include <windows.h> -CustomCCode #undef WIN32_LEAN_AND_MEAN -CustomCCode #include <gluegen_stdint.h> -CustomCCode #include <gluegen_stddef.h> -CustomCCode #include <wingdi.h> +Include glx-headers.cfg DropUniqVendorExtensions AMD # We need GL_APPLE_float_pixels for our pbuffer implementation diff --git a/make/config/jogl/wglext.cfg b/make/config/jogl/wglext.cfg index 6b5815fdf..4c0061372 100644 --- a/make/config/jogl/wglext.cfg +++ b/make/config/jogl/wglext.cfg @@ -18,6 +18,7 @@ NIOOnly __ALL__ NIODirectOnly __ALL__ GLSemHeader wingdi.h +GLSemHeader gl-types.h GLSemHeader GL/wglext.h EmitProcAddressTable true @@ -35,7 +36,6 @@ Include glx-headers.cfg # JSR-239 NIO subset (remove once we have Java SE classes running on CVM) # Inform the glue code generator of the association between #defines # and functions and the extensions in which they are defined -GLSemHeader GL/wglext.h IgnoreExtension WGL_OML_sync_control IgnoreExtension WGL_NV_gpu_affinity |