[Jake2-commits] jake2/lib/lwjgl/patch/org/lwjgl/opengl GLChecks.java, 1.1, 1.2

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

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

Modified Files:
	GLChecks.java 
Log Message:
performance patch; checks removed

Index: GLChecks.java
===================================================================
RCS file: /cvsroot/jake2/jake2/lib/lwjgl/patch/org/lwjgl/opengl/GLChecks.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GLChecks.java	17 Mar 2007 15:59:54 -0000	1.1
--- GLChecks.java	17 Mar 2007 16:02:53 -0000	1.2
***************
*** 81,135 ****
  	/** Helper method to ensure that array buffer objects are disabled. If they are enabled, we'll throw an OpenGLException */
  	static void ensureArrayVBOdisabled(ContextCapabilities caps) {
- 		if ((caps.OpenGL15 && !checkBufferObject(caps, GL15.GL_ARRAY_BUFFER_BINDING, false) ||
- 					(caps.GL_ARB_vertex_buffer_object && !checkBufferObject(caps, ARBVertexBufferObject.GL_ARRAY_BUFFER_BINDING_ARB, false))))
- 			throw new OpenGLException("Cannot use Buffers when Array Buffer Object is enabled");
  	}
  
  	/** Helper method to ensure that array buffer objects are enabled. If they are disabled, we'll throw an OpenGLException */
  	static void ensureArrayVBOenabled(ContextCapabilities caps) {
- 		if ((caps.OpenGL15 && !checkBufferObject(caps, GL15.GL_ARRAY_BUFFER_BINDING, true) ||
- 					(caps.GL_ARB_vertex_buffer_object && !checkBufferObject(caps, ARBVertexBufferObject.GL_ARRAY_BUFFER_BINDING_ARB, true))))
- 			throw new OpenGLException("Cannot use offsets when Array Buffer Object is disabled");
  	}
  
  	/** Helper method to ensure that element array buffer objects are disabled. If they are enabled, we'll throw an OpenGLException */
  	static void ensureElementVBOdisabled(ContextCapabilities caps) {
- 		if ((caps.OpenGL15 && !checkBufferObject(caps, GL15.GL_ELEMENT_ARRAY_BUFFER_BINDING, false) ||
- 					(caps.GL_ARB_vertex_buffer_object && !checkBufferObject(caps, ARBVertexBufferObject.GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB, false))))
- 			throw new OpenGLException("Cannot use Buffers when Element Array Buffer Object is enabled");
  	}
  
  	/** Helper method to ensure that element array buffer objects are enabled. If they are disabled, we'll throw an OpenGLException */
  	static void ensureElementVBOenabled(ContextCapabilities caps) {
- 		if ((caps.OpenGL15 && !checkBufferObject(caps, GL15.GL_ELEMENT_ARRAY_BUFFER_BINDING, true) ||
- 					(caps.GL_ARB_vertex_buffer_object && !checkBufferObject(caps, ARBVertexBufferObject.GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB, true))))
- 			throw new OpenGLException("Cannot use offsets when Element Array Buffer Object is disabled");
  	}
  
  	/** Helper method to ensure that pixel pack buffer objects are disabled. If they are enabled, we'll throw an OpenGLException */
  	static void ensurePackPBOdisabled(ContextCapabilities caps) {
- 		if ((caps.GL_ARB_pixel_buffer_object && !checkBufferObject(caps, ARBPixelBufferObject.GL_PIXEL_PACK_BUFFER_BINDING_ARB, false) || (caps.GL_EXT_pixel_buffer_object && !checkBufferObject(caps, EXTPixelBufferObject.GL_PIXEL_PACK_BUFFER_BINDING_EXT, false))))
- 			throw new OpenGLException("Cannot use Buffers when Pixel Pack Buffer Object is enabled");
  	}
  
  	/** Helper method to ensure that pixel pack buffer objects are enabled. If they are disabled, we'll throw an OpenGLException */
  	static void ensurePackPBOenabled(ContextCapabilities caps) {
- 		if ((caps.GL_ARB_pixel_buffer_object && !checkBufferObject(caps, ARBPixelBufferObject.GL_PIXEL_PACK_BUFFER_BINDING_ARB, true) ||
- 					(caps.GL_EXT_pixel_buffer_object && !checkBufferObject(caps, EXTPixelBufferObject.GL_PIXEL_PACK_BUFFER_BINDING_EXT, true))))
- 			throw new OpenGLException("Cannot use offsets when Pixel Pack Buffer Object is disabled");
  	}
  
  	/** Helper method to ensure that pixel unpack buffer objects are disabled. If they are enabled, we'll throw an OpenGLException */
  	static void ensureUnpackPBOdisabled(ContextCapabilities caps) {
- 		if ((caps.GL_ARB_pixel_buffer_object && !checkBufferObject(caps, ARBPixelBufferObject.GL_PIXEL_UNPACK_BUFFER_BINDING_ARB, false) ||
- 					(caps.GL_EXT_pixel_buffer_object && !checkBufferObject(caps, EXTPixelBufferObject.GL_PIXEL_UNPACK_BUFFER_BINDING_EXT, false))))
- 			throw new OpenGLException("Cannot use Buffers when Pixel Unpack Buffer Object is enabled");
  	}
  
  	/** Helper method to ensure that pixel unpack buffer objects are enabled. If they are disabled, we'll throw an OpenGLException */
  	static void ensureUnpackPBOenabled(ContextCapabilities caps) {
- 		if ((caps.GL_ARB_pixel_buffer_object && !checkBufferObject(caps, ARBPixelBufferObject.GL_PIXEL_UNPACK_BUFFER_BINDING_ARB, true) ||
- 					(caps.GL_EXT_pixel_buffer_object && !checkBufferObject(caps, EXTPixelBufferObject.GL_PIXEL_UNPACK_BUFFER_BINDING_EXT, true))))
- 			throw new OpenGLException("Cannot use offsets when Pixel Unpack Buffer Object is disabled");
  	}
  
--- 81,112 ----