summaryrefslogtreecommitdiffstats
path: root/make/config/jogl/gl-if-gl2_gl3.cfg
diff options
context:
space:
mode:
Diffstat (limited to 'make/config/jogl/gl-if-gl2_gl3.cfg')
-rw-r--r--make/config/jogl/gl-if-gl2_gl3.cfg15
1 files changed, 6 insertions, 9 deletions
diff --git a/make/config/jogl/gl-if-gl2_gl3.cfg b/make/config/jogl/gl-if-gl2_gl3.cfg
index 0c51dfe9c..467919328 100644
--- a/make/config/jogl/gl-if-gl2_gl3.cfg
+++ b/make/config/jogl/gl-if-gl2_gl3.cfg
@@ -4,21 +4,23 @@ Style InterfaceOnly
JavaClass GL2GL3
#Extends GL2GL3 GLBase
#Extends GL2GL3 GL
-Extends GL2GL3 GL2ES2
+#Extends GL2GL3 GL2ES2
+Extends GL2GL3 GL2ES3
ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL.java
ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES2.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES3.java
ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/GLBase.java
-ExtendedInterfaceSymbolsOnly ../build-temp/gluegen-set/javax/media/opengl/GL3Subset.java
+ExtendedInterfaceSymbolsOnly ../build-temp/gluegen-set/javax/media/opengl/GL2GL3Subset.java
HierarchicalNativeOutput false
Include gl-common.cfg
Include gl-common-extensions.cfg
Include gl-desktop.cfg
+Include gl3-common.cfg
Include gl-if-gl4-ignores.cfg
-
-IncludeAs CustomJavaCode GL2GL3 gl-if-CustomJavaCode-gl2_gl3.java
+Include gl-if-luminance-ignore.cfg
JavaOutputDir gensrc/classes
NativeOutputDir gensrc/native/jogl
@@ -33,11 +35,6 @@ ProcAddressTableClassName DontGenerateProcAddressTableStuff
GetProcAddressTableExpr DontGenerateProcAddressTableStuff
ForceProcAddressGen __ALL__
-# Inform the glue code generator of the association between #defines
-# and functions and the extensions in which they are defined
-GLHeader GL/gl.h
-GLHeader GL/glext.h
-
# Also force the calling conventions of the locally generated function
# pointer typedefs for these routines to APIENTRY
LocalProcAddressCallingConvention __ALL__ APIENTRY