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

Removed obsolete buffer size methods.

This commit is contained in:
Ioannis Tsakpinis 2014-08-16 01:59:37 +03:00
parent 5f5b39d3ca
commit 33e50400d2
8 changed files with 11 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/java/org/lwjgl/opengl/GLChecks.java
View File

@ -65,22 +65,6 @@ class GLChecks {
private GLChecks() {
}
static int getBufferObjectSize(ContextCapabilities caps, int buffer_enum) {
return glGetBufferParameteri(buffer_enum, GL_BUFFER_SIZE);
}
static int getBufferObjectSizeARB(ContextCapabilities caps, int buffer_enum) {
return glGetBufferParameteriARB(buffer_enum, GL_BUFFER_SIZE_ARB);
}
static int getBufferObjectSizeATI(ContextCapabilities caps, int buffer) {
return glGetObjectBufferiATI(buffer, GL_OBJECT_BUFFER_SIZE_ATI);
}
static int getNamedBufferObjectSize(ContextCapabilities caps, int buffer) {
return glGetNamedBufferParameterEXT(buffer, GL_BUFFER_SIZE);
}
/** 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 ( LWJGLUtil.CHECKS && StateTracker.getReferences(caps).arrayBuffer != 0 )

6
src/java/org/lwjgl/opengles/GLChecks.java
View File

@ -57,11 +57,7 @@ class GLChecks {
/** Static methods only! */
private GLChecks() {
}
static int getBufferObjectSize(int buffer_enum) {
return glGetBufferParameteri(buffer_enum, GLES20.GL_BUFFER_SIZE);
}
/** Helper method to ensure that array buffer objects are disabled. If they are enabled, we'll throw an OpenGLException */
static void ensureArrayVBOdisabled() {
if ( LWJGLUtil.CHECKS && StateTracker.getTracker().arrayBuffer != 0 )

4
src/templates/org/lwjgl/opengl/ARB_buffer_object.java
View File

@ -134,7 +134,7 @@ public interface ARB_buffer_object {
*/
@CachedResult
@GLvoid
@AutoSize("GLChecks.getBufferObjectSizeARB(caps, target)")
@AutoSize("glGetBufferParameteriARB(target, GL_BUFFER_SIZE_ARB)")
ByteBuffer glMapBufferARB(@GLenum int target, @GLenum int access);
boolean glUnmapBufferARB(@GLenum int target);
@ -156,6 +156,6 @@ public interface ARB_buffer_object {
void glGetBufferParameterivARB3(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
@StripPostfix("pointer")
@AutoSize("GLChecks.getBufferObjectSizeARB(caps, target)")
@AutoSize("glGetBufferParameteriARB(target, GL_BUFFER_SIZE_ARB)")
void glGetBufferPointervARB(@GLenum int target, @GLenum int pname, @Result @GLvoid ByteBuffer pointer);
}

2
src/templates/org/lwjgl/opengl/ATI_map_object_buffer.java
View File

@ -64,7 +64,7 @@ public interface ATI_map_object_buffer {
*/
@CachedResult
@GLvoid
@AutoSize("GLChecks.getBufferObjectSizeATI(caps, buffer)")
@AutoSize("ATIVertexArrayObject.glGetObjectBufferiATI(buffer, ATIVertexArrayObject.GL_OBJECT_BUFFER_SIZE_ATI)")
ByteBuffer glMapObjectBufferATI(@GLuint int buffer);
void glUnmapObjectBufferATI(@GLuint int buffer);

4
src/templates/org/lwjgl/opengl/EXT_direct_state_access.java
View File

@ -906,7 +906,7 @@ public interface EXT_direct_state_access {
@Dependent("OpenGL15")
@CachedResult
@GLvoid
@AutoSize("GLChecks.getNamedBufferObjectSize(caps, buffer)")
@AutoSize("glGetNamedBufferParameterEXT(buffer, GL15.GL_BUFFER_SIZE)")
ByteBuffer glMapNamedBufferEXT(@GLuint int buffer, @GLenum int access);
@Dependent("OpenGL15")
@ -924,7 +924,7 @@ public interface EXT_direct_state_access {
@Dependent("OpenGL15")
@StripPostfix("params")
@AutoSize("GLChecks.getNamedBufferObjectSize(caps, buffer)")
@AutoSize("glGetNamedBufferParameterEXT(buffer, GL15.GL_BUFFER_SIZE)")
void glGetNamedBufferPointervEXT(@GLuint int buffer, @GLenum int pname, @OutParameter @Result @GLvoid ByteBuffer params);
@Dependent("OpenGL15")

4
src/templates/org/lwjgl/opengl/GL15.java
View File

@ -158,7 +158,7 @@ public interface GL15 {
*/
@CachedResult
@GLvoid
@AutoSize("GLChecks.getBufferObjectSize(caps, target)")
@AutoSize("glGetBufferParameteri(target, GL_BUFFER_SIZE)")
ByteBuffer glMapBuffer(@GLenum int target, @GLenum int access);
boolean glUnmapBuffer(@GLenum int target);
@ -180,7 +180,7 @@ public interface GL15 {
void glGetBufferParameteriv3(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
@StripPostfix("pointer")
@AutoSize("GLChecks.getBufferObjectSize(caps, target)")
@AutoSize("glGetBufferParameteri(target, GL_BUFFER_SIZE)")
void glGetBufferPointerv(@GLenum int target, @GLenum int pname, @OutParameter @Result @GLvoid ByteBuffer pointer);
// -----------------------------------------------------------------

2
src/templates/org/lwjgl/opengles/GLES30.java
View File

@ -427,7 +427,7 @@ public interface GLES30 {
boolean glUnmapBuffer(@GLenum int target);
@StripPostfix("pointer")
@AutoSize("GLChecks.getBufferObjectSize(target)")
@AutoSize("GLES20.glGetBufferParameteri(target, GLES20.GL_BUFFER_SIZE)")
void glGetBufferPointerv(@GLenum int target, @GLenum int pname, @OutParameter @Result @GLvoid ByteBuffer pointer);
void glDrawBuffers(@AutoSize("buffers") @GLsizei int size, @Const @GLenum IntBuffer buffers);

4
src/templates/org/lwjgl/opengles/OES_mapbuffer.java
View File

@ -51,7 +51,7 @@ public interface OES_mapbuffer {
@StripPostfix("pointer")
@CachedResult
@AutoSize("GLChecks.getBufferObjectSize(target)")
@AutoSize("GLES20.glGetBufferParameteri(target, GLES20.GL_BUFFER_SIZE)")
void glGetBufferPointervOES(@GLenum int target, @GLenum int pname, @OutParameter @Result @GLvoid ByteBuffer pointer);
/**
@ -78,7 +78,7 @@ public interface OES_mapbuffer {
*/
@CachedResult
@GLvoid
@AutoSize("GLChecks.getBufferObjectSize(target)")
@AutoSize("GLES20.glGetBufferParameteri(target, GLES20.GL_BUFFER_SIZE)")
ByteBuffer glMapBufferOES(@GLenum int target, @GLenum int access);
boolean glUnmapBufferOES(@GLenum int target);