|
From: <sp...@us...> - 2012-11-25 00:54:07
|
Revision: 3830
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3830&view=rev
Author: spasi
Date: 2012-11-25 00:54:00 +0000 (Sun, 25 Nov 2012)
Log Message:
-----------
Added alternative VertexAttribPointer with ByteBuffer data and explicit type.
Modified Paths:
--------------
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java 2012-11-20 19:10:15 UTC (rev 3829)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java 2012-11-25 00:54:00 UTC (rev 3830)
@@ -32,7 +32,6 @@
package org.lwjgl.opengl;
import org.lwjgl.util.generator.*;
-import org.lwjgl.util.generator.Alternate;
import org.lwjgl.util.generator.opengl.*;
import java.nio.*;
@@ -49,13 +48,13 @@
* Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
* GetFloatv, and GetDoublev:
*/
- int GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB = 0x8B4A;
- int GL_MAX_VARYING_FLOATS_ARB = 0x8B4B;
- int GL_MAX_VERTEX_ATTRIBS_ARB = 0x8869;
- int GL_MAX_TEXTURE_IMAGE_UNITS_ARB = 0x8872;
- int GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB = 0x8B4C;
+ int GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB = 0x8B4A;
+ int GL_MAX_VARYING_FLOATS_ARB = 0x8B4B;
+ int GL_MAX_VERTEX_ATTRIBS_ARB = 0x8869;
+ int GL_MAX_TEXTURE_IMAGE_UNITS_ARB = 0x8872;
+ int GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB = 0x8B4C;
int GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB = 0x8B4D;
- int GL_MAX_TEXTURE_COORDS_ARB = 0x8871;
+ int GL_MAX_TEXTURE_COORDS_ARB = 0x8871;
/**
* Accepted by the <cap> parameter of Disable, Enable, and IsEnabled, and
@@ -63,19 +62,19 @@
* GetDoublev:
*/
int GL_VERTEX_PROGRAM_POINT_SIZE_ARB = 0x8642;
- int GL_VERTEX_PROGRAM_TWO_SIDE_ARB = 0x8643;
+ int GL_VERTEX_PROGRAM_TWO_SIDE_ARB = 0x8643;
/** Accepted by the <pname> parameter GetObjectParameter{if}vARB: */
- int GL_OBJECT_ACTIVE_ATTRIBUTES_ARB = 0x8B89;
+ int GL_OBJECT_ACTIVE_ATTRIBUTES_ARB = 0x8B89;
int GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB = 0x8B8A;
/** Accepted by the <pname> parameter of GetVertexAttrib{dfi}vARB: */
- int GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB = 0x8622;
- int GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB = 0x8623;
- int GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB = 0x8624;
- int GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB = 0x8625;
+ int GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB = 0x8622;
+ int GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB = 0x8623;
+ int GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB = 0x8624;
+ int GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB = 0x8625;
int GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB = 0x886A;
- int GL_CURRENT_VERTEX_ATTRIB_ARB = 0x8626;
+ int GL_CURRENT_VERTEX_ATTRIB_ARB = 0x8626;
/** Accepted by the <pname> parameter of GetVertexAttribPointervARB: */
int GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB = 0x8645;
@@ -141,6 +140,13 @@
@GLfloat
@GLdouble Buffer buffer);
+ @Alternate("glVertexAttribPointerARB")
+ void glVertexAttribPointerARB(@GLuint int index, int size, @GLenum int type, boolean normalized, @GLsizei int stride,
+ @CachedReference(index = "index", name = "glVertexAttribPointer_buffer")
+ @BufferObject(BufferKind.ArrayVBO)
+ @Check
+ @Const ByteBuffer buffer);
+
void glEnableVertexAttribArrayARB(@GLuint int index);
void glDisableVertexAttribArrayARB(@GLuint int index);
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java 2012-11-20 19:10:15 UTC (rev 3829)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java 2012-11-25 00:54:00 UTC (rev 3830)
@@ -367,6 +367,13 @@
@GLfloat
@GLdouble Buffer buffer);
+ @Alternate("glVertexAttribPointer")
+ void glVertexAttribPointer(@GLuint int index, int size, @GLenum int type, boolean normalized, @GLsizei int stride,
+ @CachedReference(index = "index", name = "glVertexAttribPointer_buffer")
+ @BufferObject(BufferKind.ArrayVBO)
+ @Check
+ @Const ByteBuffer buffer);
+
void glEnableVertexAttribArray(@GLuint int index);
void glDisableVertexAttribArray(@GLuint int index);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|