From a622ffbced14e1e2fe797c82fc62c431ffb6949f Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Wed, 11 Mar 2015 17:58:52 +0100 Subject: Bug 1135: GLBufferObjectTracker for GL 4.5: Separate GL 4.5 DSA and GL_EXT_direct_state_access We cannot subsume/rename even parts of GL_EXT_direct_state_access, since it is explcit stated in the spec that no assumption shall be made in regards compatibility and interaction. Hence we add both, GL 4.5 DSA and GL_EXT_direct_state_access. --- make/config/jogl/gl-if-CustomJavaCode-gl2.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'make/config/jogl/gl-if-CustomJavaCode-gl2.java') diff --git a/make/config/jogl/gl-if-CustomJavaCode-gl2.java b/make/config/jogl/gl-if-CustomJavaCode-gl2.java index 283f72da1..d7def0ef9 100644 --- a/make/config/jogl/gl-if-CustomJavaCode-gl2.java +++ b/make/config/jogl/gl-if-CustomJavaCode-gl2.java @@ -9,6 +9,9 @@ * Throws a {@link GLException} if GL-function constraints are not met. *

*

+ * Depends on GL_EXT_direct_state_access. + *

+ *

* {@link GL2#glMapNamedBufferEXT(int, int)} wrapper calls this method and returns {@link GLBufferStorage#getMappedBuffer()}. *

* @param bufferName denotes the buffer @@ -17,7 +20,7 @@ * @throws GLException if buffer is already mapped * @throws GLException if buffer has invalid store size, i.e. less-than zero */ - public GLBufferStorage mapNamedBuffer(int bufferName, int access) throws GLException; + public GLBufferStorage mapNamedBufferEXT(int bufferName, int access) throws GLException; /** * Returns the {@link GLBufferStorage} instance as mapped via OpenGL's native {@link GL2#glMapNamedBufferRangeEXT(int, long, long, int) glMapNamedBufferRangeEXT(..)} implementation. @@ -25,6 +28,9 @@ * Throws a {@link GLException} if GL-function constraints are not met. *

*

+ * Depends on GL_EXT_direct_state_access. + *

+ *

* {@link GL2#glMapNamedBufferRangeEXT(int, long, long, int)} wrapper calls this method and returns {@link GLBufferStorage#getMappedBuffer()}. *

* @param bufferName denotes the buffer @@ -36,5 +42,5 @@ * @throws GLException if buffer has invalid store size, i.e. less-than zero * @throws GLException if buffer mapping range does not fit, incl. offset */ - public GLBufferStorage mapNamedBufferRange(final int bufferName, final long offset, final long length, final int access) throws GLException; + public GLBufferStorage mapNamedBufferRangeEXT(final int bufferName, final long offset, final long length, final int access) throws GLException; -- cgit v1.2.3