jake2-commits

[Carsten W. <ca...@us...>]

Update of /cvsroot/jake2/jake2/lib/lwjgl/patch/org/lwjgl/opengl
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv13123/lib/lwjgl/patch/org/lwjgl/opengl

Modified Files:
	GLChecks.java 
Log Message:
update to lwjgl 1.1

Index: GLChecks.java
===================================================================
RCS file: /cvsroot/jake2/jake2/lib/lwjgl/patch/org/lwjgl/opengl/GLChecks.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GLChecks.java	17 Mar 2007 16:02:53 -0000	1.2
--- GLChecks.java	11 May 2007 20:55:17 -0000	1.3
***************
*** 126,139 ****
  	}
  
! 	static int calculateTexImage1DStorage(Buffer buffer, int format, int type, int width, int border) {
! 		return calculateTexImage1DStorage(format, type, width, border) >> 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 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);
  	}
  
--- 126,139 ----
  	}
  
! 	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) {
! 		return calculateTexImage2DStorage(format, type, width, height) >> 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);
  	}
  
***************
*** 153,166 ****
  	}
  
! 	private static int calculateTexImage1DStorage(int format, int type, int width, int border) {
! 		return calculateBytesPerPixel(format, type) * (width + (border << 1));
  	}
  
! 	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 calculateTexImage3DStorage(int format, int type, int width, int height, int depth, int border) {
! 		return calculateTexImage2DStorage(format, type, width, height, border) * (depth + (border << 1));
  	}
  
--- 153,166 ----
  	}
  
! 	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) {
! 		return calculateTexImage1DStorage(format, type, width) * height;
  	}
  
! 	private static int calculateTexImage3DStorage(int format, int type, int width, int height, int depth) {
! 		return calculateTexImage2DStorage(format, type, width, height) * depth;
  	}