diff options
author | Sven Gothel <[email protected]> | 2013-07-15 22:49:47 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2013-07-15 22:49:47 +0200 |
commit | 6136457f10d020c779adc78641d0048f77ab1635 (patch) | |
tree | bc47249ff202f2a6f218f5fa4bae155167a590ef /make/config | |
parent | 4af77a92acf5bc2e27f9dea444a8c84d6775cf77 (diff) |
Fix BuildComposablePipeline's isGL*/getGL* ; GLBase: getDownstreamGL()/getRootGL(); GLContext.isGL* added proper API doc., isGL3core()/hasNoDefaultVAO() and getDefaultVAO().
- Fix BuildComposablePipeline's isGL*/getGL* (regression of commit 3a0d7703da32e9a5ddf08a334f18588a78038d880)
- GLBase: getDownstreamGL()/getRootGL()
Allows user traversing through pipelined GL instances.
Also added getRootGL() to GLContext.
- GLContext.isGL* added proper API doc.: We test the actual context, not the profile.
- GLContext isGL3core()/hasNoDefaultVAO() and getDefaultVAO()
- Move isGL3code() def. back to pre 3a0d7703da32e9a5ddf08a334f18588a78038d880, i.e. Includes [ GL4, GL3 ] w/o GLES3.
- Added hasNoDefaultVAO() and getDefaultVAO() .. incl. [ GL4, GL3, GLES3 ]
Diffstat (limited to 'make/config')
-rw-r--r-- | make/config/jogl/gl-impl-CustomJavaCode-common.java | 10 | ||||
-rw-r--r-- | make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java | 2 | ||||
-rw-r--r-- | make/config/jogl/gl-impl-CustomJavaCode-gles3.java | 2 |
3 files changed, 12 insertions, 2 deletions
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-common.java b/make/config/jogl/gl-impl-CustomJavaCode-common.java index 4024d8e1a..2254e5f0b 100644 --- a/make/config/jogl/gl-impl-CustomJavaCode-common.java +++ b/make/config/jogl/gl-impl-CustomJavaCode-common.java @@ -25,6 +25,16 @@ } @Override + public final GL getDownstreamGL() throws GLException { + return null; + } + + @Override + public final GL getRootGL() throws GLException { + return this; + } + + @Override public final boolean isGL() { return true; } diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java b/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java index cacea322a..5ac2837fa 100644 --- a/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java +++ b/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java @@ -287,7 +287,7 @@ private final boolean checkBufferObject(boolean extensionAvail, } if ( allowVAO ) { buffer = bufferStateTracker.getBoundBufferObject(GL2GL3.GL_VERTEX_ARRAY_BINDING, this); - if( 0 != buffer && !_context.isDefaultVAO(buffer) ) { + if( 0 != buffer && _context.getDefaultVAO() != buffer ) { return true; } } diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gles3.java b/make/config/jogl/gl-impl-CustomJavaCode-gles3.java index e0b0c6a09..bb4a6246b 100644 --- a/make/config/jogl/gl-impl-CustomJavaCode-gles3.java +++ b/make/config/jogl/gl-impl-CustomJavaCode-gles3.java @@ -205,7 +205,7 @@ private final boolean checkBufferObject(boolean extensionAvail, } if ( allowVAO ) { buffer = bufferStateTracker.getBoundBufferObject(GLES3.GL_VERTEX_ARRAY_BINDING, this); - if( 0 != buffer && !_context.isDefaultVAO(buffer) ) { + if( 0 != buffer && _context.getDefaultVAO() != buffer ) { return true; } } |