diff options
| author | Sven Gothel <[email protected]> | 2009-08-01 05:37:29 -0700 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2009-08-01 05:37:29 -0700 |
| commit | 4e0a5af0b359b98b26ea3e961d023c658650be6c (patch) | |
| tree | ef7ca95b4c74dc5aedf7fcf11b6e4c3b07a6b95f /make/config | |
| parent | a9439fa3ecd366c419815959daedc030f4b8b4e1 (diff) | |
GL3 Related:
- Fix glGetStringi's return type to String
- Fix ExtensionAvailabilityCache:
GL3's glGetStringi for GL_EXTENSIONS
Ensure to add GL_VERSION_2_0 in case version >= 3.0
Ensure to not exceed version 3.0 for non GL3.1 context.
In case of GL 3.1, do not include GL_VERSIONS below 3.0,
since this is a forward compatible context.
- Add Prologue to glGetString, where the ExtensionCache is being
used for GL_EXTENSIONS - if already initialized.
This feature adds backward compatibility for GL3 context on GL_EXTENSION.
+++
General:
Add GLPipelineFactory, a convenient pipeline factory for Debug/Trace and custom ones ..
Change 'void setGL(GL)' to 'GL setGL(GL)', and let it return the successful set GL,
or null.
Diffstat (limited to 'make/config')
| -rw-r--r-- | make/config/jogl/gl-common.cfg | 9 | ||||
| -rw-r--r-- | make/config/jogl/gl-gl2es12.cfg | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/make/config/jogl/gl-common.cfg b/make/config/jogl/gl-common.cfg index a26c6a6b3..269ea68a7 100644 --- a/make/config/jogl/gl-common.cfg +++ b/make/config/jogl/gl-common.cfg @@ -230,6 +230,7 @@ IgnoreExtension GL_EXT_texture_rectangle Opaque boolean GLboolean ReturnsString glGetString +ReturnsString glGetStringi # Experimental: Only NIO function, no arrays .. # NIOOnly __ALL__ @@ -324,6 +325,14 @@ ArgumentIsString glTransformFeedbackVaryings 2 # ArgumentIsString glGetTransformFeedbackVarying 6 # +# Use cached GL_EXTENSION if possible, +# which also allows GL3 compatibility. +# +JavaPrologue glGetString if(GL.GL_EXTENSIONS==name && _context.isExtensionCacheInitialized()) { +JavaPrologue glGetString return _context.getGLExtensions(); +JavaPrologue glGetString } + +# # Directives for Vertex Buffer Object and Pixel Buffer Object checking # # NOTE: we currently don't emit glue code for some of these but diff --git a/make/config/jogl/gl-gl2es12.cfg b/make/config/jogl/gl-gl2es12.cfg index 27fa138d4..36bab82ed 100644 --- a/make/config/jogl/gl-gl2es12.cfg +++ b/make/config/jogl/gl-gl2es12.cfg @@ -13,10 +13,10 @@ ExtendedInterfaceSymbolsOnly ../src/jogl/classes/javax/media/opengl/fixedfunc/GL Style ImplOnly ImplPackage com.sun.opengl.impl.gl2es12 ImplJavaClass GL2ES12Impl +Implements GL2ES12Impl GLBase Implements GL2ES12Impl GL Implements GL2ES12Impl GL2ES1 Implements GL2ES12Impl GL2ES2 -Implements GL2ES12Impl GLBase Include gl-common-gl2.cfg Include gl-common-extensions.cfg |