From ecc62164e88389f08fb4abb0fab9759c4a95189f Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Wed, 18 Feb 2004 19:02:49 +0000 Subject: [PATCH] *** empty log message *** --- .../org_lwjgl_opengl_ARBVertexBufferObject.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBVertexBufferObject.cpp b/src/native/common/arb/org_lwjgl_opengl_ARBVertexBufferObject.cpp index 33908e61..1e1400dd 100644 --- a/src/native/common/arb/org_lwjgl_opengl_ARBVertexBufferObject.cpp +++ b/src/native/common/arb/org_lwjgl_opengl_ARBVertexBufferObject.cpp @@ -180,15 +180,14 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexBufferObject_nglGetBufferS JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_ARBVertexBufferObject_glMapBufferARB (JNIEnv * env, jclass clazz, jint target, jint access, jint size, jobject oldBuffer) { - CHECK_EXISTS(glMapBufferARB) - void *buffer_address = glMapBufferARB((GLenum)target, (GLenum)access); - CHECK_GL_ERROR - if (oldBuffer != NULL) { - void *old_buffer_address = env->GetDirectBufferAddress(oldBuffer); - if (old_buffer_address == buffer_address) - return oldBuffer; - } - return safeNewBuffer(env, buffer_address, size); + CHECK_EXISTS(glMapBufferARB) + void *buffer_address = glMapBufferARB((GLenum)target, (GLenum)access); + CHECK_GL_ERROR + void *old_buffer_address = safeGetBufferAddress(env, oldBuffer, 0); + if (old_buffer_address == buffer_address) + return oldBuffer; + else + return safeNewBuffer(env, buffer_address, size); } /*