From db0bdc71eec40d7fcd22ddcea87178c8805d4312 Mon Sep 17 00:00:00 2001 From: Kenneth Russel Date: Thu, 7 Aug 2003 19:53:38 +0000 Subject: Changed glMapBufferARB's implementation to return the same ByteBuffer if the address and capacity of the underlying buffer object haven't changed. This saves applications the cost of re-slicing the returned buffer each frame and avoids allocation of one or more finalizable objects per frame. Moved GlueGen's checking of whether a passed buffer is direct up into Java from C to be able to handle buffers that wrap the NULL pointer (needed for the "buffer offsets" used by ARB_vertex_buffer_object). Ported the VertexArrayRange demo to VertexBufferObject. Currently slower than VertexArrayRange but needs to be updated to triangulate the geometry more efficiently (currently the triangle strips are only 48 vertices long) and to move the indices into fast RAM. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@47 232f8b59-042b-4e1e-8c03-345bb8c30851 --- make/gl-impl-CustomJavaCode.java | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) (limited to 'make/gl-impl-CustomJavaCode.java') diff --git a/make/gl-impl-CustomJavaCode.java b/make/gl-impl-CustomJavaCode.java index 86fac5b5c..bd2be71f6 100644 --- a/make/gl-impl-CustomJavaCode.java +++ b/make/gl-impl-CustomJavaCode.java @@ -1,3 +1,17 @@ +// Attempt to return the same ByteBuffer object from glMapBufferARB if +// the vertex buffer object's base address and size haven't changed +private static class ARBVBOKey { + private long addr; + private int capacity; + + ARBVBOKey(long addr, int capacity) { + this.addr = addr; + this.capacity = capacity; + } +} + +private Map/**/ arbVBOCache = new HashMap(); + /** Entry point to C language function:
LPVOID glMapBufferARB(GLenum target, GLenum access); */ public java.nio.ByteBuffer glMapBufferARB(int target, int access) { final long __addr_ = _context.getGLProcAddressTable()._addressof_glMapBufferARB; @@ -6,11 +20,20 @@ public java.nio.ByteBuffer glMapBufferARB(int target, int access) { } int[] sz = new int[1]; glGetBufferParameterivARB(target, GL_BUFFER_SIZE_ARB, sz); - ByteBuffer _res; - _res = dispatch_glMapBufferARB(target, access, sz[0], __addr_); - if (_res == null) return null; - return _res.order(ByteOrder.nativeOrder()); + long addr; + addr = dispatch_glMapBufferARB(target, access, __addr_); + if (addr == 0 || sz[0] == 0) { + return null; + } + ARBVBOKey key = new ARBVBOKey(addr, sz[0]); + ByteBuffer _res = (ByteBuffer) arbVBOCache.get(key); + if (_res == null) { + _res = InternalBufferUtils.newDirectByteBuffer(addr, sz[0]); + _res.order(ByteOrder.nativeOrder()); + arbVBOCache.put(key, _res); + } + return _res; } /** Encapsulates function pointer for OpenGL function
: LPVOID glMapBufferARB(GLenum target, GLenum access); */ -native private java.nio.ByteBuffer dispatch_glMapBufferARB(int target, int access, int size, long glProcAddress); +native private long dispatch_glMapBufferARB(int target, int access, long glProcAddress); -- cgit v1.2.3