michael/lwjgl
michael
/
lwjgl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improved API for glBufferData

This commit is contained in:
Ioannis Tsakpinis 2005-01-29 23:13:00 +00:00
parent 9b33e40a3b
commit 5ef40a803a
6 changed files with 137 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/java/org/lwjgl/opengl/ARBBufferObject.java
View File

@ -118,24 +118,28 @@ public abstract class ARBBufferObject {
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) {
BufferChecks.checkDirectOrNull(data);
nglBufferDataARB(target, data != null ? data.remaining() << 2 : size, data, data != null ? data.position() << 2 : 0, 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, int size, IntBuffer data, int 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, IntBuffer data, int usage) {
BufferChecks.checkDirectOrNull(data);
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);

14
src/java/org/lwjgl/opengl/ARBProgram.java
View File

@ -161,12 +161,7 @@ public abstract class ARBProgram {
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 @@ public abstract class ARBProgram {
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) {

28
src/java/org/lwjgl/opengl/GL15.java
View File

@ -118,24 +118,28 @@ public final class GL15 {
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);

60
src/java/org/lwjgl/util/GL.java
View File

@ -3164,41 +3164,46 @@ public class GL {
/**
* @param target
* @param size
* @param data
* @param usage
*/
public static void glBufferData(int target, int size, ByteBuffer data, int usage) {
GL15.glBufferData(target, size, data, usage);
*/
public static void glBufferData(int target, int size, int usage) {
GL15.glBufferData(target, size, usage);
}
/**
* @param target
* @param size
* @param data
* @param usage
*/
public static void glBufferData(int target, int size, FloatBuffer data, int usage) {
GL15.glBufferData(target, size, data, usage);
public static void glBufferData(int target, ByteBuffer data, int usage) {
GL15.glBufferData(target, data, usage);
}
/**
* @param target
* @param size
* @param data
* @param usage
*/
public static void glBufferData(int target, int size, IntBuffer data, int usage) {
GL15.glBufferData(target, size, data, usage);
public static void glBufferData(int target, FloatBuffer data, int usage) {
GL15.glBufferData(target, data, usage);
}
/**
* @param target
* @param size
* @param data
* @param usage
*/
public static void glBufferData(int target, int size, ShortBuffer data, int usage) {
GL15.glBufferData(target, size, data, usage);
public static void glBufferData(int target, IntBuffer data, int usage) {
GL15.glBufferData(target, data, usage);
}
/**
* @param target
* @param data
* @param usage
*/
public static void glBufferData(int target, ShortBuffer data, int usage) {
GL15.glBufferData(target, data, usage);
}
/**
@ -3395,41 +3400,46 @@ public class GL {
/**
* @param target
* @param size
* @param data
* @param usage
*/
public static void glBufferDataARB(int target, int size, ByteBuffer data, int usage) {
ARBBufferObject.glBufferDataARB(target, size, data, usage);
public static void glBufferDataARB(int target, int size, int usage) {
ARBBufferObject.glBufferDataARB(target, size, usage);
}
/**
* @param target
* @param size
* @param data
* @param usage
*/
public static void glBufferDataARB(int target, int size, FloatBuffer data, int usage) {
ARBBufferObject.glBufferDataARB(target, size, data, usage);
public static void glBufferDataARB(int target, ByteBuffer data, int usage) {
ARBBufferObject.glBufferDataARB(target, data, usage);
}
/**
* @param target
* @param size
* @param data
* @param usage
*/
public static void glBufferDataARB(int target, int size, IntBuffer data, int usage) {
ARBBufferObject.glBufferDataARB(target, size, data, usage);
public static void glBufferDataARB(int target, FloatBuffer data, int usage) {
ARBBufferObject.glBufferDataARB(target, data, usage);
}
/**
* @param target
* @param size
* @param data
* @param usage
*/
public static void glBufferDataARB(int target, int size, ShortBuffer data, int usage) {
ARBBufferObject.glBufferDataARB(target, size, data, usage);
public static void glBufferDataARB(int target, IntBuffer data, int usage) {
ARBBufferObject.glBufferDataARB(target, data, usage);
}
/**
* @param target
* @param data
* @param usage
*/
public static void glBufferDataARB(int target, ShortBuffer data, int usage) {
ARBBufferObject.glBufferDataARB(target, data, usage);
}
/**

84
src/java/org/lwjgl/util/GLImpl.java
View File

@ -318,81 +318,91 @@ public class GLImpl implements IGL {
/**
* @param target
* @param size
* @param usage
*/
public void glBufferData(int target, int size, int usage) {
GL.glBufferData(target, size, usage);
}
/**
* @param target
* @param data
* @param usage
*/
public void glBufferData(int target, int size, ByteBuffer data, int usage) {
GL.glBufferData(target, size, data, usage);
public void glBufferData(int target, ByteBuffer data, int usage) {
GL.glBufferData(target, data, usage);
}
/**
* @param target
* @param data
* @param usage
*/
public void glBufferData(int target, FloatBuffer data, int usage) {
GL.glBufferData(target, data, usage);
}
/**
* @param target
* @param data
* @param usage
*/
public void glBufferData(int target, IntBuffer data, int usage) {
GL.glBufferData(target, data, usage);
}
/**
* @param target
* @param data
* @param usage
*/
public void glBufferData(int target, ShortBuffer data, int usage) {
GL.glBufferData(target, data, usage);
}
/**
* @param target
* @param size
* @param data
* @param usage
*/
public void glBufferData(int target, int size, FloatBuffer data, int usage) {
GL.glBufferData(target, size, data, usage);
public void glBufferDataARB(int target, int size, int usage) {
GL.glBufferDataARB(target, size, usage);
}
/**
* @param target
* @param size
* @param data
* @param usage
*/
public void glBufferData(int target, int size, IntBuffer data, int usage) {
GL.glBufferData(target, size, data, usage);
public void glBufferDataARB(int target, ByteBuffer data, int usage) {
GL.glBufferDataARB(target, data, usage);
}
/**
* @param target
* @param size
* @param data
* @param usage
*/
public void glBufferData(int target, int size, ShortBuffer data, int usage) {
GL.glBufferData(target, size, data, usage);
public void glBufferDataARB(int target, FloatBuffer data, int usage) {
GL.glBufferDataARB(target, data, usage);
}
/**
* @param target
* @param size
* @param data
* @param usage
*/
public void glBufferDataARB(int target, int size, ByteBuffer data, int usage) {
GL.glBufferDataARB(target, size, data, usage);
public void glBufferDataARB(int target, IntBuffer data, int usage) {
GL.glBufferDataARB(target, data, usage);
}
/**
* @param target
* @param size
* @param data
* @param usage
*/
public void glBufferDataARB(int target, int size, FloatBuffer data, int usage) {
GL.glBufferDataARB(target, size, data, usage);
}
/**
* @param target
* @param size
* @param data
* @param usage
*/
public void glBufferDataARB(int target, int size, IntBuffer data, int usage) {
GL.glBufferDataARB(target, size, data, usage);
}
/**
* @param target
* @param size
* @param data
* @param usage
*/
public void glBufferDataARB(int target, int size, ShortBuffer data, int usage) {
GL.glBufferDataARB(target, size, data, usage);
public void glBufferDataARB(int target, ShortBuffer data, int usage) {
GL.glBufferDataARB(target, data, usage);
}
/**

38
src/java/org/lwjgl/util/IGL.java
View File

@ -2649,34 +2649,37 @@ public interface IGL {
/**
* @param target
* @param size
* @param data
* @param usage
*/
void glBufferData(int target, int size, ByteBuffer data, int usage);
void glBufferData(int target, int size, int usage);
/**
* @param target
* @param size
* @param data
* @param usage
*/
void glBufferData(int target, int size, FloatBuffer data, int usage);
void glBufferData(int target, ByteBuffer data, int usage);
/**
* @param target
* @param size
* @param data
* @param usage
*/
void glBufferData(int target, int size, IntBuffer data, int usage);
void glBufferData(int target, FloatBuffer data, int usage);
/**
* @param target
* @param size
* @param data
* @param usage
*/
void glBufferData(int target, int size, ShortBuffer data, int usage);
void glBufferData(int target, IntBuffer data, int usage);
/**
* @param target
* @param data
* @param usage
*/
void glBufferData(int target, ShortBuffer data, int usage);
/**
* @param target
@ -2836,34 +2839,37 @@ public interface IGL {
/**
* @param target
* @param size
* @param data
* @param usage
*/
void glBufferDataARB(int target, int size, ByteBuffer data, int usage);
void glBufferDataARB(int target, int size, int usage);
/**
* @param target
* @param size
* @param data
* @param usage
*/
void glBufferDataARB(int target, int size, FloatBuffer data, int usage);
void glBufferDataARB(int target, ByteBuffer data, int usage);
/**
* @param target
* @param size
* @param data
* @param usage
*/
void glBufferDataARB(int target, int size, IntBuffer data, int usage);
void glBufferDataARB(int target, FloatBuffer data, int usage);
/**
* @param target
* @param size
* @param data
* @param usage
*/
void glBufferDataARB(int target, int size, ShortBuffer data, int usage);
void glBufferDataARB(int target, IntBuffer data, int usage);
/**
* @param target
* @param data
* @param usage
*/
void glBufferDataARB(int target, ShortBuffer data, int usage);
/**
* @param target