shadowfacts/lwjgl2-arm64
1
0
Fork 0
mirror of https://github.com/shadowfacts/lwjgl2-arm64.git synced 2026-01-10 10:49:57 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Moved null check from generated code to BufferChecks and removed unused buffer checks

Browse source
This commit is contained in:
Elias Naur 2007-04-11 16:13:05 +00:00
parent db7acb07ce
commit 5a2c33423a
2 changed files with 31 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
src/java/org/lwjgl/BufferChecks.java
View file

@ -124,23 +124,6 @@ public class BufferChecks {
/**
* Helper methods to ensure a buffer is direct (and, implicitly, non-null).
*/
public static void checkDirectBuffer(Buffer buf) {
if (buf instanceof FloatBuffer)
checkDirect((FloatBuffer)buf);
else if (buf instanceof ByteBuffer)
checkDirect((ByteBuffer)buf);
else if (buf instanceof ShortBuffer)
checkDirect((ShortBuffer)buf);
else if (buf instanceof IntBuffer)
checkDirect((IntBuffer)buf);
else if (buf instanceof LongBuffer)
checkDirect((LongBuffer)buf);
else if (buf instanceof DoubleBuffer)
checkDirect((DoubleBuffer)buf);
else
throw new IllegalStateException("Unsupported buffer type");
}
public static void checkDirect(ByteBuffer buf) {
if (!buf.isDirect()) {
throw new IllegalArgumentException("ByteBuffer is not direct");
@ -231,36 +214,41 @@ public class BufferChecks {
}
/**
* Helper methods to ensure a buffer is big enough to receive data from a
* glGet* operation. To avoid unnecessarily complex buffer size checking
* we've just set the bar artificially high and insist that any receiving
* buffer has at least 4 remaining().
*
* @param buf
* The buffer to check
* @throws IllegalArgumentException
* Helper methods to ensure a buffer is direct, has a minimum size or null.
*/
public static void checkBuffer(ByteBuffer buf) {
checkBuffer(buf, DEFAULT_BUFFER_SIZE);
public static void checkBufferOrNull(ByteBuffer buf, int size) {
if (buf != null) {
checkBuffer(buf, size);
}
}
public static void checkBuffer(ShortBuffer buf) {
checkBuffer(buf, DEFAULT_BUFFER_SIZE);
public static void checkBufferOrNull(ShortBuffer buf, int size) {
if (buf != null) {
checkBuffer(buf, size);
}
}
public static void checkBuffer(IntBuffer buf) {
checkBuffer(buf, DEFAULT_BUFFER_SIZE);
public static void checkBufferOrNull(IntBuffer buf, int size) {
if (buf != null) {
checkBuffer(buf, size);
}
}
public static void checkBuffer(LongBuffer buf) {
checkBuffer(buf, DEFAULT_BUFFER_SIZE);
public static void checkBufferOrNull(LongBuffer buf, int size) {
if (buf != null) {
checkBuffer(buf, size);
}
}
public static void checkBuffer(FloatBuffer buf) {
checkBuffer(buf, DEFAULT_BUFFER_SIZE);
public static void checkBufferOrNull(FloatBuffer buf, int size) {
if (buf != null) {
checkBuffer(buf, size);
}
}
public static void checkBuffer(DoubleBuffer buf) {
checkBuffer(buf, DEFAULT_BUFFER_SIZE);
public static void checkBufferOrNull(DoubleBuffer buf, int size) {
if (buf != null) {
checkBuffer(buf, size);
}
}
}

11
src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java
View file

@ -437,15 +437,16 @@ public class JavaMethodsGenerator {
}
private static void printParameterCheck(PrintWriter writer, String name, String check_value, boolean can_be_null, boolean null_terminated) {
if (can_be_null) {
writer.println("\t\tif (" + name + " != null)");
writer.print("\t");
}
writer.print("\t\tBufferChecks.check");
if (check_value != null && !"".equals(check_value) ) {
writer.print("Buffer(" + name + ", " + check_value);
writer.print("Buffer");
if (can_be_null)
writer.print("OrNull");
writer.print("(" + name + ", " + check_value);
} else {
writer.print("Direct");
if (can_be_null)
writer.print("OrNull");
writer.print("(" + name);
}
writer.println(");");