java-game-lib-cvs Mailing List for Lightweight Java Game Library

Revision: 2768
          http://svn.sourceforge.net/java-game-lib/?rev=2768&view=rev
Author:   elias_naur
Date:     2007-04-15 12:43:35 -0700 (Sun, 15 Apr 2007)

Log Message:
-----------
Move null parameter checks from check classes to the generated classes, since calculateImageSize assumes the buffer being non-null

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/BufferChecks.java
    trunk/LWJGL/src/java/org/lwjgl/NondirectBufferWrapper.java
    trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java

Modified: trunk/LWJGL/src/java/org/lwjgl/BufferChecks.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/BufferChecks.java	2007-04-15 19:33:03 UTC (rev 2767)
+++ trunk/LWJGL/src/java/org/lwjgl/BufferChecks.java	2007-04-15 19:43:35 UTC (rev 2768)
@@ -85,45 +85,6 @@
 	}
 
 	/**
-	 * Helper methods to ensure a buffer is direct or null.
-	 */
-	public static void checkDirectOrNull(ByteBuffer buf) {
-		if (buf != null) {
-			checkDirect(buf);
-		}
-	}
-
-	public static void checkDirectOrNull(ShortBuffer buf) {
-		if (buf != null) {
-			checkDirect(buf);
-		}
-	}
-
-	public static void checkDirectOrNull(IntBuffer buf) {
-		if (buf != null) {
-			checkDirect(buf);
-		}
-	}
-
-	public static void checkDirectOrNull(LongBuffer buf) {
-		if (buf != null) {
-			checkDirect(buf);
-		}
-	}
-
-	public static void checkDirectOrNull(FloatBuffer buf) {
-		if (buf != null) {
-			checkDirect(buf);
-		}
-	}
-
-	public static void checkDirectOrNull(DoubleBuffer buf) {
-		if (buf != null) {
-			checkDirect(buf);
-		}
-	}
-
-	/**
 	 * Helper methods to ensure a buffer is direct (and, implicitly, non-null).
 	 */
 	public static void checkDirect(ByteBuffer buf) {
@@ -214,43 +175,4 @@
 		checkBufferSize(buf, size);
 		checkDirect(buf);
 	}
-
-	/**
-	 * Helper methods to ensure a buffer is direct, has a minimum size or null.
-	 */
-	public static void checkBufferOrNull(ByteBuffer buf, int size) {
-		if (buf != null) {
-			checkBuffer(buf, size);
-		}
-	}
-
-	public static void checkBufferOrNull(ShortBuffer buf, int size) {
-		if (buf != null) {
-			checkBuffer(buf, size);
-		}
-	}
-
-	public static void checkBufferOrNull(IntBuffer buf, int size) {
-		if (buf != null) {
-			checkBuffer(buf, size);
-		}
-	}
-
-	public static void checkBufferOrNull(LongBuffer buf, int size) {
-		if (buf != null) {
-			checkBuffer(buf, size);
-		}
-	}
-
-	public static void checkBufferOrNull(FloatBuffer buf, int size) {
-		if (buf != null) {
-			checkBuffer(buf, size);
-		}
-	}
-
-	public static void checkBufferOrNull(DoubleBuffer buf, int size) {
-		if (buf != null) {
-			checkBuffer(buf, size);
-		}
-	}
 }

Modified: trunk/LWJGL/src/java/org/lwjgl/NondirectBufferWrapper.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/NondirectBufferWrapper.java	2007-04-15 19:33:03 UTC (rev 2767)
+++ trunk/LWJGL/src/java/org/lwjgl/NondirectBufferWrapper.java	2007-04-15 19:43:35 UTC (rev 2768)
@@ -67,42 +67,6 @@
 		return buffers;
 	}
 
-	public static ByteBuffer wrapBufferOrNull(ByteBuffer buf, int size) {
-		if (buf != null)
-			return wrapBuffer(buf, size);
-		return buf;
-	}
-
-	public static ShortBuffer wrapBufferOrNull(ShortBuffer buf, int size) {
-		if (buf != null)
-			return wrapBuffer(buf, size);
-		return buf;
-	}
-
-	public static IntBuffer wrapBufferOrNull(IntBuffer buf, int size) {
-		if (buf != null)
-			return wrapBuffer(buf, size);
-		return buf;
-	}
-
-	public static LongBuffer wrapBufferOrNull(LongBuffer buf, int size) {
-		if (buf != null)
-			return wrapBuffer(buf, size);
-		return buf;
-	}
-
-	public static FloatBuffer wrapBufferOrNull(FloatBuffer buf, int size) {
-		if (buf != null)
-			return wrapBuffer(buf, size);
-		return buf;
-	}
-
-	public static DoubleBuffer wrapBufferOrNull(DoubleBuffer buf, int size) {
-		if (buf != null)
-			return wrapBuffer(buf, size);
-		return buf;
-	}
-
 	public static ByteBuffer wrapBuffer(ByteBuffer buf, int size) {
 		BufferChecks.checkBufferSize(buf, size);
 		return wrapDirect(buf);
@@ -133,42 +97,6 @@
 		return wrapDirect(buf);
 	}
 
-	public static ByteBuffer wrapDirectOrNull(ByteBuffer buffer) {
-		if (buffer != null)
-			return wrapDirect(buffer);
-		return buffer;
-	}
-
-	public static ShortBuffer wrapDirectOrNull(ShortBuffer buffer) {
-		if (buffer != null)
-			return wrapDirect(buffer);
-		return buffer;
-	}
-
-	public static FloatBuffer wrapDirectOrNull(FloatBuffer buffer) {
-		if (buffer != null)
-			return wrapDirect(buffer);
-		return buffer;
-	}
-
-	public static IntBuffer wrapDirectOrNull(IntBuffer buffer) {
-		if (buffer != null)
-			return wrapDirect(buffer);
-		return buffer;
-	}
-
-	public static LongBuffer wrapDirectOrNull(LongBuffer buffer) {
-		if (buffer != null)
-			return wrapDirect(buffer);
-		return buffer;
-	}
-
-	public static DoubleBuffer wrapDirectOrNull(DoubleBuffer buffer) {
-		if (buffer != null)
-			return wrapDirect(buffer);
-		return buffer;
-	}
-
 	public static ByteBuffer wrapDirect(ByteBuffer buffer) {
 		if (!buffer.isDirect())
 			return doWrap(buffer);

Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java	2007-04-15 19:33:03 UTC (rev 2767)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java	2007-04-15 19:43:35 UTC (rev 2768)
@@ -438,20 +438,18 @@
 	}
 
 	private static void printParameterCheck(PrintWriter writer, String name, String check_value, boolean can_be_null, boolean null_terminated, boolean indirect_buffer_allowed) {
+		if (can_be_null) {
+			writer.println("\t\tif (" + name + " != null)");
+			writer.print("\t");
+		}
 		if (indirect_buffer_allowed)
 			writer.print("\t\t" + name + " = NondirectBufferWrapper.wrap");
 		else
 			writer.print("\t\tBufferChecks.check");
 		if (check_value != null && !"".equals(check_value) ) {
-			writer.print("Buffer");
-			if (can_be_null)
-				writer.print("OrNull");
-			writer.print("(" + name + ", " + check_value);
+			writer.print("Buffer(" + name + ", " + check_value);
 		} else {
-			writer.print("Direct");
-			if (can_be_null)
-				writer.print("OrNull");
-			writer.print("(" + name);
+			writer.print("Direct(" + name);
 		}
 		writer.println(");");
 		if (null_terminated)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2767
          http://svn.sourceforge.net/java-game-lib/?rev=2767&view=rev
Author:   elias_naur
Date:     2007-04-15 12:33:03 -0700 (Sun, 15 Apr 2007)

Log Message:
-----------
Don't add border when checking image sizes

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/BufferUtils.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/GLChecks.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL11.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL12.java

Modified: trunk/LWJGL/src/java/org/lwjgl/BufferUtils.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/BufferUtils.java	2007-04-11 20:33:07 UTC (rev 2766)
+++ trunk/LWJGL/src/java/org/lwjgl/BufferUtils.java	2007-04-15 19:33:03 UTC (rev 2767)
@@ -133,7 +133,7 @@
 		else if (buf instanceof LongBuffer || buf instanceof DoubleBuffer)
 			return 3;
 		else
-			throw new IllegalStateException("Unsupported buffer type");
+			throw new IllegalStateException("Unsupported buffer type: " + buf);
 	}
 
 	/**

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/GLChecks.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/GLChecks.java	2007-04-11 20:33:07 UTC (rev 2766)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/GLChecks.java	2007-04-15 19:33:03 UTC (rev 2767)
@@ -148,16 +148,16 @@
 		return calculateImageStorage(format, type, width, height, depth) >> BufferUtils.getElementSizeExponent(buffer);
 	}
 
-	static int calculateTexImage1DStorage(Buffer buffer, int format, int type, int width, int border) {
-		return calculateTexImage1DStorage(format, type, width, border) >> BufferUtils.getElementSizeExponent(buffer);
+	static int calculateTexImage1DStorage(Buffer buffer, int format, int type, int width) {
+		return calculateTexImage1DStorage(format, type, width) >> BufferUtils.getElementSizeExponent(buffer);
 	}
 
-	static int calculateTexImage2DStorage(Buffer buffer, int format, int type, int width, int height, int border) {
-		return calculateTexImage2DStorage(format, type, width, height, border) >> BufferUtils.getElementSizeExponent(buffer);
+	static int calculateTexImage2DStorage(Buffer buffer, int format, int type, int width, int height) {
+		return calculateTexImage2DStorage(format, type, width, height) >> BufferUtils.getElementSizeExponent(buffer);
 	}
 
-	static int calculateTexImage3DStorage(Buffer buffer, int format, int type, int width, int height, int depth, int border) {
-		return calculateTexImage3DStorage(format, type, width, height, depth, border) >> BufferUtils.getElementSizeExponent(buffer);
+	static int calculateTexImage3DStorage(Buffer buffer, int format, int type, int width, int height, int depth) {
+		return calculateTexImage3DStorage(format, type, width, height, depth) >> BufferUtils.getElementSizeExponent(buffer);
 	}
 
 	/**
@@ -175,16 +175,16 @@
 		return calculateBytesPerPixel(format, type) * width * height * depth;
 	}
 
-	private static int calculateTexImage1DStorage(int format, int type, int width, int border) {
-		return calculateBytesPerPixel(format, type) * (width + (border << 1));
+	private static int calculateTexImage1DStorage(int format, int type, int width) {
+		return calculateBytesPerPixel(format, type) * width;
 	}
 
-	private static int calculateTexImage2DStorage(int format, int type, int width, int height, int border) {
-		return calculateTexImage1DStorage(format, type, width, border) * (height + (border << 1));
+	private static int calculateTexImage2DStorage(int format, int type, int width, int height) {
+		return calculateTexImage1DStorage(format, type, width) * height;
 	}
 
-	private static int calculateTexImage3DStorage(int format, int type, int width, int height, int depth, int border) {
-		return calculateTexImage2DStorage(format, type, width, height, border) * (depth + (border << 1));
+	private static int calculateTexImage3DStorage(int format, int type, int width, int height, int depth) {
+		return calculateTexImage2DStorage(format, type, width, height) * depth;
 	}
 
 	private static int calculateBytesPerPixel(int format, int type) {

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL11.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL11.java	2007-04-11 20:33:07 UTC (rev 2766)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL11.java	2007-04-15 19:33:03 UTC (rev 2767)
@@ -1261,7 +1261,7 @@
 
 	void glTexImage1D(@GLenum int target, int level, int internalformat, @GLsizei int width, int border, @GLenum int format, @GLenum int type,
 	                  @BufferObject(BufferKind.UnpackPBO)
-	                  @Check(value = "GLChecks.calculateTexImage1DStorage(pixels, format, type, width, border)", canBeNull = true)
+	                  @Check(value = "GLChecks.calculateTexImage1DStorage(pixels, format, type, width)", canBeNull = true)
 	                  @Const
 	                  @GLbyte
 	                  @GLshort
@@ -1271,7 +1271,7 @@
 
 	void glTexImage2D(@GLenum int target, int level, int internalformat, int width, int height, int border, @GLenum int format, @GLenum int type,
 	                  @BufferObject(BufferKind.UnpackPBO)
-	                  @Check(value = "GLChecks.calculateTexImage2DStorage(pixels, format, type, width, height, border)", canBeNull = true)
+	                  @Check(value = "GLChecks.calculateTexImage2DStorage(pixels, format, type, width, height)", canBeNull = true)
 	                  @Const
 	                  @GLbyte
 	                  @GLshort

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL12.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL12.java	2007-04-11 20:33:07 UTC (rev 2766)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL12.java	2007-04-15 19:33:03 UTC (rev 2767)
@@ -97,7 +97,7 @@
 
 	void glTexImage3D(@GLenum int target, int level, int internalFormat, @GLsizei int width, @GLsizei int height, @GLsizei int depth, int border, @GLenum int format, @GLenum int type,
 	                  @BufferObject(BufferKind.UnpackPBO)
-	                  @Check(value = "GLChecks.calculateTexImage3DStorage(pixels, format, type, width, height, depth, border)", canBeNull = true)
+	                  @Check(value = "GLChecks.calculateTexImage3DStorage(pixels, format, type, width, height, depth)", canBeNull = true)
 	                  @Const
 	                  @GLbyte
 	                  @GLshort


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.