diff options
| author | Sven Gothel <[email protected]> | 2013-10-10 02:15:56 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-10-10 02:15:56 +0200 |
| commit | 4e83a5df7a851cc33d85f76381f058256906ad4c (patch) | |
| tree | 9454329d601da72c7e4642491406dac8eed3d4c6 /make/config/jogl/gl-if-gl2.cfg | |
| parent | e96b2d648e7d69b95325fb6b80c6eb508e1e8a14 (diff) | |
Bug 852: Remove CPU sourced data API entry where not allowed (ES3 and GL core >= 3.0) ; GL2 cfg: Ignore GL2ES3 symbols (super)
Remove CPU sourced data API entries via new config 'BufferObjectOnly <name>',
listed in 'gl-common-gpubufferonly.cfg' and included in ES3 and all GL core >= 3 interfaces.
If BufferObjectOnly is defined for a function, only the 'long offset' variant is being emitted.
Due to limitations of GlueGen's 'ExtendedInterfaceSymbolsIgnore A.java', which only
identifies the function name and not the signature - all CPU sourced variants
are manually added to the compatibility and ES2 GL profiles via '*-common-cpubufferJavaCode.java' files.
GLContext: Added 'isCPUSourcedAvail()' to determine whether context allows CPU sourced data,
i.e. for GL2ES1 and GLES2 ctx.
GLContext/GLProfile/GL: isGLES2() now returns false if having a ES3 context due to 'CPU sourced'
incompatibility!
+++
GL2 cfg: Added ignore GL2ES3 symbols of it's superclass, removing duplicated symbols.
Diffstat (limited to 'make/config/jogl/gl-if-gl2.cfg')
| -rw-r--r-- | make/config/jogl/gl-if-gl2.cfg | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/make/config/jogl/gl-if-gl2.cfg b/make/config/jogl/gl-if-gl2.cfg index 60efd73af..37f7b6feb 100644 --- a/make/config/jogl/gl-if-gl2.cfg +++ b/make/config/jogl/gl-if-gl2.cfg @@ -5,6 +5,7 @@ NativeOutputDir gensrc/native/jogl/gl2 ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL.java ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES1.java ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES2.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES3.java ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2GL3.java ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/GLBase.java ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/fixedfunc/GLMatrixFunc.java @@ -26,6 +27,8 @@ Include gl-if-gl3-ignores.cfg Include gl-if-gl4-ignores.cfg IncludeAs CustomJavaCode GL2 gl-if-CustomJavaCode-gl_compat.java +IncludeAs CustomJavaCode GL2 gl2_es2-common-cpubufferJavaCode.java +IncludeAs CustomJavaCode GL2 gl2-common-cpubufferJavaCode.java # Pick up on-line OpenGL javadoc thanks to user cylab on javagaming.org forums TagNativeBinding true |