Fix VBO tests and bump Sys native JNI library version
This commit is contained in:
parent
ceab6f366e
commit
175ac13445
|
@ -57,7 +57,7 @@ public final class Sys {
|
||||||
private static final String VERSION = "1.0-rc1";
|
private static final String VERSION = "1.0-rc1";
|
||||||
|
|
||||||
/** Current version of the JNI library */
|
/** Current version of the JNI library */
|
||||||
static final int JNI_VERSION = 6;
|
static final int JNI_VERSION = 7;
|
||||||
|
|
||||||
/** The implementation instance to delegate platform specific behavior to */
|
/** The implementation instance to delegate platform specific behavior to */
|
||||||
private final static SysImplementation implementation;
|
private final static SysImplementation implementation;
|
||||||
|
|
|
@ -169,7 +169,6 @@ public final class VBOIndexTest {
|
||||||
|
|
||||||
ByteBuffer new_mapped_buffer = ARBBufferObject.glMapBufferARB(ARBVertexBufferObject.GL_ARRAY_BUFFER_ARB,
|
ByteBuffer new_mapped_buffer = ARBBufferObject.glMapBufferARB(ARBVertexBufferObject.GL_ARRAY_BUFFER_ARB,
|
||||||
ARBBufferObject.GL_WRITE_ONLY_ARB,
|
ARBBufferObject.GL_WRITE_ONLY_ARB,
|
||||||
2 * 4 * 4,
|
|
||||||
mapped_buffer);
|
mapped_buffer);
|
||||||
if ( new_mapped_buffer != mapped_buffer )
|
if ( new_mapped_buffer != mapped_buffer )
|
||||||
mapped_float_buffer = new_mapped_buffer.order(ByteOrder.nativeOrder()).asFloatBuffer();
|
mapped_float_buffer = new_mapped_buffer.order(ByteOrder.nativeOrder()).asFloatBuffer();
|
||||||
|
@ -177,7 +176,6 @@ public final class VBOIndexTest {
|
||||||
|
|
||||||
new_mapped_buffer = ARBBufferObject.glMapBufferARB(ARBVertexBufferObject.GL_ELEMENT_ARRAY_BUFFER_ARB,
|
new_mapped_buffer = ARBBufferObject.glMapBufferARB(ARBVertexBufferObject.GL_ELEMENT_ARRAY_BUFFER_ARB,
|
||||||
ARBBufferObject.GL_WRITE_ONLY_ARB,
|
ARBBufferObject.GL_WRITE_ONLY_ARB,
|
||||||
4 * 4,
|
|
||||||
mapped_indices_buffer);
|
mapped_indices_buffer);
|
||||||
if ( new_mapped_buffer != mapped_indices_buffer )
|
if ( new_mapped_buffer != mapped_indices_buffer )
|
||||||
mapped_indices_int_buffer = new_mapped_buffer.order(ByteOrder.nativeOrder()).asIntBuffer();
|
mapped_indices_int_buffer = new_mapped_buffer.order(ByteOrder.nativeOrder()).asIntBuffer();
|
||||||
|
|
|
@ -163,7 +163,6 @@ public final class VBOTest {
|
||||||
GL11.glRotatef(angle, 0, 0, 1.0f);
|
GL11.glRotatef(angle, 0, 0, 1.0f);
|
||||||
ByteBuffer new_mapped_buffer = ARBBufferObject.glMapBufferARB(ARBVertexBufferObject.GL_ARRAY_BUFFER_ARB,
|
ByteBuffer new_mapped_buffer = ARBBufferObject.glMapBufferARB(ARBVertexBufferObject.GL_ARRAY_BUFFER_ARB,
|
||||||
ARBBufferObject.GL_WRITE_ONLY_ARB,
|
ARBBufferObject.GL_WRITE_ONLY_ARB,
|
||||||
2 * 4 * 4,
|
|
||||||
mapped_buffer);
|
mapped_buffer);
|
||||||
if ( new_mapped_buffer != mapped_buffer )
|
if ( new_mapped_buffer != mapped_buffer )
|
||||||
mapped_float_buffer = new_mapped_buffer.order(ByteOrder.nativeOrder()).asFloatBuffer();
|
mapped_float_buffer = new_mapped_buffer.order(ByteOrder.nativeOrder()).asFloatBuffer();
|
||||||
|
|
Loading…
Reference in New Issue