Menu
▾
▴
[Java-game-lib-cvs] LWJGL/src/java/org/lwjgl/opengl ARBBufferObject.java,1.11,1.12 ARBProgram.java,1.14,1.15 GL15.java,1.13,1.14
|
From: Ioannis T. <sp...@us...> - 2005-01-29 23:11:05
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3732 Modified Files: ARBBufferObject.java ARBProgram.java GL15.java Log Message: Improved API for glBufferData Index: ARBBufferObject.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ARBBufferObject.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- ARBBufferObject.java 13 Jan 2005 20:32:30 -0000 1.11 +++ ARBBufferObject.java 29 Jan 2005 23:10:55 -0000 1.12 @@ -118,24 +118,28 @@ public static native boolean glIsBufferARB(int buffer); - public static void glBufferDataARB(int target, int size, ByteBuffer data, int usage) { - BufferChecks.checkDirectOrNull(data); - nglBufferDataARB(target, data != null ? data.remaining() : size, data, data != null ? data.position() : 0, usage); + public static void glBufferDataARB(int target, int size, int usage) { + nglBufferDataARB(target, size, null, 0, usage); } - public static void glBufferDataARB(int target, int size, ShortBuffer data, int usage) { - BufferChecks.checkDirectOrNull(data); - nglBufferDataARB(target, data != null ? data.remaining() << 1 : size, data, data != null ? data.position() << 1 : 0, usage); + public static void glBufferDataARB(int target, ByteBuffer data, int usage) { + BufferChecks.checkDirect(data); + nglBufferDataARB(target, data.remaining(), data, data.position(), usage); } - public static void glBufferDataARB(int target, int size, FloatBuffer data, int usage) { + public static void glBufferDataARB(int target, ShortBuffer data, int usage) { + BufferChecks.checkDirect(data); + nglBufferDataARB(target, data.remaining() << 1, data, data.position() << 1, usage); + } + + public static void glBufferDataARB(int target, FloatBuffer data, int usage) { BufferChecks.checkDirectOrNull(data); - nglBufferDataARB(target, data != null ? data.remaining() << 2 : size, data, data != null ? data.position() << 2 : 0, usage); + nglBufferDataARB(target, data.remaining() << 2, data, data.position() << 2, usage); } - public static void glBufferDataARB(int target, int size, IntBuffer data, int usage) { + public static void glBufferDataARB(int target, IntBuffer data, int usage) { BufferChecks.checkDirectOrNull(data); - nglBufferDataARB(target, data != null ? data.remaining() << 2 : size, data, data != null ? data.position() << 2 : 0, usage); + nglBufferDataARB(target, data.remaining() << 2, data, data.position() << 2, usage); } private static native void nglBufferDataARB(int target, int size, Buffer data, int data_offset, int usage); Index: ARBProgram.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ARBProgram.java,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- ARBProgram.java 25 Nov 2004 22:20:43 -0000 1.14 +++ ARBProgram.java 29 Jan 2005 23:10:55 -0000 1.15 @@ -161,12 +161,7 @@ private static native void nglGenProgramsARB(int n, IntBuffer programs, int programsOffset); // --------------------------- - public static native void glProgramEnvParameter4fARB(int target, - int index, - float x, - float y, - float z, - float w); + public static native void glProgramEnvParameter4fARB(int target, int index, float x, float y, float z, float w); private static void checkProgramEnv(int index, Buffer buf) { if ( index < 0 ) { @@ -187,12 +182,7 @@ private static native void nglProgramEnvParameter4fvARB(int target, int index, FloatBuffer params, int paramsOffset); // --------------------------- - public static native void glProgramLocalParameter4fARB(int target, - int index, - float x, - float y, - float z, - float w); + public static native void glProgramLocalParameter4fARB(int target, int index, float x, float y, float z, float w); // --------------------------- public static void glProgramLocalParameterARB(int target, int index, FloatBuffer params) { Index: GL15.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/GL15.java,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- GL15.java 13 Jan 2005 20:32:31 -0000 1.13 +++ GL15.java 29 Jan 2005 23:10:55 -0000 1.14 @@ -118,24 +118,28 @@ public static native boolean glIsBuffer(int buffer); - public static void glBufferData(int target, int size, ByteBuffer data, int usage) { - BufferChecks.checkDirectOrNull(data); - nglBufferData(target, data != null ? data.remaining() : size, data, data != null ? data.position() : 0, usage); + public static void glBufferData(int target, int size, int usage) { + nglBufferData(target, size, null, 0, usage); } - public static void glBufferData(int target, int size, ShortBuffer data, int usage) { - BufferChecks.checkDirectOrNull(data); - nglBufferData(target, data != null ? data.remaining() << 1 : size, data, data != null ? data.position() << 1 : 0, usage); + public static void glBufferData(int target, ByteBuffer data, int usage) { + BufferChecks.checkDirect(data); + nglBufferData(target, data.remaining(), data, data.position(), usage); } - public static void glBufferData(int target, int size, FloatBuffer data, int usage) { - BufferChecks.checkDirectOrNull(data); - nglBufferData(target, data != null ? data.remaining() << 2 : size, data, data != null ? data.position() << 2 : 0, usage); + public static void glBufferData(int target, ShortBuffer data, int usage) { + BufferChecks.checkDirect(data); + nglBufferData(target, data.remaining() << 1, data, data.position() << 1, usage); } - public static void glBufferData(int target, int size, IntBuffer data, int usage) { - BufferChecks.checkDirectOrNull(data); - nglBufferData(target, data != null ? data.remaining() << 2 : size, data, data != null ? data.position() << 2 : 0, usage); + public static void glBufferData(int target, FloatBuffer data, int usage) { + BufferChecks.checkDirect(data); + nglBufferData(target, data.remaining() << 2, data, data.position() << 2, usage); + } + + public static void glBufferData(int target, IntBuffer data, int usage) { + BufferChecks.checkDirect(data); + nglBufferData(target, data.remaining() << 2, data, data.position() << 2, usage); } private static native void nglBufferData(int target, int size, Buffer data, int data_offset, int usage); |
