From e213836e39a1c0a909dbe47a25ec5bc10de06196 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Mon, 13 Feb 2012 07:50:20 +0100 Subject: Reduce GL* interface 'extends' to direct base interface. --- make/config/jogl/gl-es1.cfg | 4 ++-- make/config/jogl/gl-es2.cfg | 4 ++-- make/config/jogl/gl-gl4bc.cfg | 14 +++++++------- make/config/jogl/gl-if-gl2.cfg | 6 +++--- make/config/jogl/gl-if-gl2_es1.cfg | 2 +- make/config/jogl/gl-if-gl2_es2.cfg | 2 +- make/config/jogl/gl-if-gl2_gl3.cfg | 4 ++-- make/config/jogl/gl-if-gl3.cfg | 6 +++--- make/config/jogl/gl-if-gl3bc.cfg | 10 +++++----- make/config/jogl/gl-if-gl4.cfg | 8 ++++---- 10 files changed, 30 insertions(+), 30 deletions(-) (limited to 'make/config') diff --git a/make/config/jogl/gl-es1.cfg b/make/config/jogl/gl-es1.cfg index 518dc07b5..1488c18e6 100644 --- a/make/config/jogl/gl-es1.cfg +++ b/make/config/jogl/gl-es1.cfg @@ -14,8 +14,8 @@ Ignore glGetBufferPointervOES Package javax.media.opengl Style InterfaceAndImpl JavaClass GLES1 -Extends GLES1 GLBase -Extends GLES1 GL +#Extends GLES1 GLBase +#Extends GLES1 GL Extends GLES1 GL2ES1 ImplPackage jogamp.opengl.es1 ImplJavaClass GLES1Impl diff --git a/make/config/jogl/gl-es2.cfg b/make/config/jogl/gl-es2.cfg index 614904aa0..8b6152bd0 100644 --- a/make/config/jogl/gl-es2.cfg +++ b/make/config/jogl/gl-es2.cfg @@ -9,8 +9,8 @@ ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/GLBase.jav Package javax.media.opengl Style InterfaceAndImpl JavaClass GLES2 -Extends GLES2 GLBase -Extends GLES2 GL +#Extends GLES2 GLBase +#Extends GLES2 GL Extends GLES2 GL2ES2 ImplPackage jogamp.opengl.es2 ImplJavaClass GLES2Impl diff --git a/make/config/jogl/gl-gl4bc.cfg b/make/config/jogl/gl-gl4bc.cfg index 67582af91..ae77b2eb8 100644 --- a/make/config/jogl/gl-gl4bc.cfg +++ b/make/config/jogl/gl-gl4bc.cfg @@ -18,13 +18,13 @@ ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/fixedfunc/ Package javax.media.opengl Style InterfaceAndImpl JavaClass GL4bc -Extends GL4bc GLBase -Extends GL4bc GL -Extends GL4bc GL2ES1 -Extends GL4bc GL2ES2 -Extends GL4bc GL2GL3 -Extends GL4bc GL2 -Extends GL4bc GL3 +#Extends GL4bc GLBase +#Extends GL4bc GL +#Extends GL4bc GL2ES1 +#Extends GL4bc GL2ES2 +#Extends GL4bc GL2GL3 +#Extends GL4bc GL2 +#Extends GL4bc GL3 Extends GL4bc GL3bc Extends GL4bc GL4 ImplPackage jogamp.opengl.gl4 diff --git a/make/config/jogl/gl-if-gl2.cfg b/make/config/jogl/gl-if-gl2.cfg index da6ca1647..d9bddae53 100644 --- a/make/config/jogl/gl-if-gl2.cfg +++ b/make/config/jogl/gl-if-gl2.cfg @@ -14,10 +14,10 @@ ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/fixedfunc/ Package javax.media.opengl Style InterfaceOnly JavaClass GL2 -Extends GL2 GLBase -Extends GL2 GL +#Extends GL2 GLBase +#Extends GL2 GL Extends GL2 GL2ES1 -Extends GL2 GL2ES2 +#Extends GL2 GL2ES2 Extends GL2 GL2GL3 Include gl-common.cfg Include gl-common-extensions.cfg diff --git a/make/config/jogl/gl-if-gl2_es1.cfg b/make/config/jogl/gl-if-gl2_es1.cfg index 2aaee0620..db3389064 100644 --- a/make/config/jogl/gl-if-gl2_es1.cfg +++ b/make/config/jogl/gl-if-gl2_es1.cfg @@ -2,7 +2,7 @@ Package javax.media.opengl Style InterfaceOnly JavaClass GL2ES1 -Extends GL2ES1 GLBase +#Extends GL2ES1 GLBase Extends GL2ES1 GL Extends GL2ES1 GLMatrixFunc Extends GL2ES1 GLPointerFunc diff --git a/make/config/jogl/gl-if-gl2_es2.cfg b/make/config/jogl/gl-if-gl2_es2.cfg index a466ea5dd..95c89eb37 100644 --- a/make/config/jogl/gl-if-gl2_es2.cfg +++ b/make/config/jogl/gl-if-gl2_es2.cfg @@ -8,7 +8,7 @@ ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/GLBase.jav Package javax.media.opengl Style InterfaceOnly JavaClass GL2ES2 -Extends GL2ES2 GLBase +#Extends GL2ES2 GLBase Extends GL2ES2 GL HierarchicalNativeOutput false diff --git a/make/config/jogl/gl-if-gl2_gl3.cfg b/make/config/jogl/gl-if-gl2_gl3.cfg index 99e241f23..12de7afd3 100644 --- a/make/config/jogl/gl-if-gl2_gl3.cfg +++ b/make/config/jogl/gl-if-gl2_gl3.cfg @@ -2,8 +2,8 @@ Package javax.media.opengl Style InterfaceOnly JavaClass GL2GL3 -Extends GL2GL3 GLBase -Extends GL2GL3 GL +#Extends GL2GL3 GLBase +#Extends GL2GL3 GL Extends GL2GL3 GL2ES2 ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL.java diff --git a/make/config/jogl/gl-if-gl3.cfg b/make/config/jogl/gl-if-gl3.cfg index fc08eccfd..88cf57d04 100644 --- a/make/config/jogl/gl-if-gl3.cfg +++ b/make/config/jogl/gl-if-gl3.cfg @@ -10,9 +10,9 @@ ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/GLBase.jav Package javax.media.opengl Style InterfaceOnly JavaClass GL3 -Extends GL3 GLBase -Extends GL3 GL -Extends GL3 GL2ES2 +#Extends GL3 GLBase +#Extends GL3 GL +#Extends GL3 GL2ES2 Extends GL3 GL2GL3 ImplPackage jogamp.opengl.gl3 ImplJavaClass GL3Impl diff --git a/make/config/jogl/gl-if-gl3bc.cfg b/make/config/jogl/gl-if-gl3bc.cfg index 6765e099f..3381051c6 100644 --- a/make/config/jogl/gl-if-gl3bc.cfg +++ b/make/config/jogl/gl-if-gl3bc.cfg @@ -16,11 +16,11 @@ ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/fixedfunc/ Package javax.media.opengl Style InterfaceOnly JavaClass GL3bc -Extends GL3bc GLBase -Extends GL3bc GL -Extends GL3bc GL2ES1 -Extends GL3bc GL2ES2 -Extends GL3bc GL2GL3 +#Extends GL3bc GLBase +#Extends GL3bc GL +#Extends GL3bc GL2ES1 +#Extends GL3bc GL2ES2 +#Extends GL3bc GL2GL3 Extends GL3bc GL2 Extends GL3bc GL3 diff --git a/make/config/jogl/gl-if-gl4.cfg b/make/config/jogl/gl-if-gl4.cfg index dbcf633b2..5b4d45200 100644 --- a/make/config/jogl/gl-if-gl4.cfg +++ b/make/config/jogl/gl-if-gl4.cfg @@ -11,10 +11,10 @@ ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/GLBase.jav Package javax.media.opengl Style InterfaceOnly JavaClass GL4 -Extends GL4 GLBase -Extends GL4 GL -Extends GL4 GL2ES2 -Extends GL4 GL2GL3 +#Extends GL4 GLBase +#Extends GL4 GL +#Extends GL4 GL2ES2 +#Extends GL4 GL2GL3 Extends GL4 GL3 Include gl-common.cfg Include gl-common-extensions.cfg -- cgit v1.2.3