From 0d59bd4c655ef9a27f127000848aae7f07f240ae Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Fri, 6 Mar 2015 09:45:48 +0100 Subject: Bug 1135 - Change all GlueGen config files, supporting EGL 1.5 , ES 3.1 and GL 4.5 --- make/config/jogl/gl-es1.cfg | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'make/config/jogl/gl-es1.cfg') diff --git a/make/config/jogl/gl-es1.cfg b/make/config/jogl/gl-es1.cfg index cc87a879e..98d892247 100644 --- a/make/config/jogl/gl-es1.cfg +++ b/make/config/jogl/gl-es1.cfg @@ -2,6 +2,13 @@ JavaOutputDir gensrc/classes 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.h + ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL.java ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES1.java ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/GLBase.java @@ -25,6 +32,7 @@ Implements GLES1Impl GL2ES1 HierarchicalNativeOutput false Include gl-common.cfg Include gl-common-extensions.cfg +Include gl-desktop-ignores.cfg EmitProcAddressTable true ProcAddressTableClassName GLES1ProcAddressTable @@ -67,20 +75,10 @@ CustomJavaCode GLES1Impl glClearDepthf((float)depth); } CustomJavaCode GLES1Impl public void glDepthRange(double zNear, double zFar) { CustomJavaCode GLES1Impl glDepthRangef((float)zNear, (float)zFar); } -CustomCCode #include /* android */ -CustomCCode /* Define GL_GLEXT_PROTOTYPES so that the OpenGL extension prototypes in -CustomCCode "glext.h" are parsed. */ -CustomCCode #define GL_GLEXT_PROTOTYPES - -CustomCCode /* Include the OpenGL headers */ -CustomCCode /* #define GL_APICALL __declspec(dllimport) */ -CustomCCode #include -CustomCCode #include -CustomCCode #include - IncludeAs CustomJavaCode GLES1Impl gl-impl-CustomJavaCode-common.java IncludeAs CustomJavaCode GLES1Impl gl-impl-CustomJavaCode-gles1.java -IncludeAs CustomJavaCode GLES1Impl gl-impl-CustomJavaCode-embedded.java + +Include es1-headers.cfg IncludeAs CustomCCode gl-impl-CustomCCode-gles1.c Import com.jogamp.opengl.GLES1 -- cgit v1.2.3