Menu
▾
▴
[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3787] trunk/LWJGL/src
|
From: <sp...@us...> - 2012-08-18 14:00:52
|
Revision: 3787
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3787&view=rev
Author: spasi
Date: 2012-08-18 14:00:45 +0000 (Sat, 18 Aug 2012)
Log Message:
-----------
Fixes related to the new alternate signatures.
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/opengl/GLChecks.java
trunk/LWJGL/src/java/org/lwjgl/opengles/GLChecks.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/SyncTest.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/ShaderUNI.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/sprites/SpriteShootout.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/sprites/SpriteShootout2P.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/sprites/SpriteShootoutCL.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/sprites/SpriteShootoutMapped.java
trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/Shader.java
trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/ShaderProgram.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_subroutine.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/GLChecks.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/GLChecks.java 2012-08-18 11:46:25 UTC (rev 3786)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/GLChecks.java 2012-08-18 14:00:45 UTC (rev 3787)
@@ -66,15 +66,15 @@
}
static int getBufferObjectSize(ContextCapabilities caps, int buffer_enum) {
- return glGetBufferParameter(buffer_enum, GL_BUFFER_SIZE);
+ return glGetBufferParameteri(buffer_enum, GL_BUFFER_SIZE);
}
static int getBufferObjectSizeARB(ContextCapabilities caps, int buffer_enum) {
- return glGetBufferParameterARB(buffer_enum, GL_BUFFER_SIZE_ARB);
+ return glGetBufferParameteriARB(buffer_enum, GL_BUFFER_SIZE_ARB);
}
static int getBufferObjectSizeATI(ContextCapabilities caps, int buffer) {
- return glGetObjectBufferATI(buffer, GL_OBJECT_BUFFER_SIZE_ATI);
+ return glGetObjectBufferiATI(buffer, GL_OBJECT_BUFFER_SIZE_ATI);
}
static int getNamedBufferObjectSize(ContextCapabilities caps, int buffer) {
Modified: trunk/LWJGL/src/java/org/lwjgl/opengles/GLChecks.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengles/GLChecks.java 2012-08-18 11:46:25 UTC (rev 3786)
+++ trunk/LWJGL/src/java/org/lwjgl/opengles/GLChecks.java 2012-08-18 14:00:45 UTC (rev 3787)
@@ -59,7 +59,7 @@
}
static int getBufferObjectSize(int buffer_enum) {
- return glGetBufferParameter(buffer_enum, GLES20.GL_BUFFER_SIZE);
+ 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 */
Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/SyncTest.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/SyncTest.java 2012-08-18 11:46:25 UTC (rev 3786)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/SyncTest.java 2012-08-18 14:00:45 UTC (rev 3787)
@@ -130,7 +130,7 @@
System.out.println("Unexpected wait status: 0x" + Integer.toHexString(status));
}
- System.out.println("Sync Status: " + (glGetSync(sync, GL_SYNC_STATUS) == GL_UNSIGNALED ? "UNSIGNALED" : "SIGNALED"));
+ System.out.println("Sync Status: " + (glGetSynci(sync, GL_SYNC_STATUS) == GL_UNSIGNALED ? "UNSIGNALED" : "SIGNALED"));
glDeleteSync(sync);
Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/ShaderUNI.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/ShaderUNI.java 2012-08-18 11:46:25 UTC (rev 3786)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/ShaderUNI.java 2012-08-18 14:00:45 UTC (rev 3787)
@@ -75,7 +75,7 @@
printShaderObjectInfoLog(file, shaderID);
- if ( glGetShader(shaderID, GL_COMPILE_STATUS) == GL_FALSE )
+ if ( glGetShaderi(shaderID, GL_COMPILE_STATUS) == GL_FALSE )
ShadersTest.kill("A compilation error occured in a vertex shader.");
programID = glCreateProgram();
@@ -85,14 +85,14 @@
printShaderProgramInfoLog(programID);
- if ( glGetProgram(programID, GL_LINK_STATUS) == GL_FALSE )
+ if ( glGetProgrami(programID, GL_LINK_STATUS) == GL_FALSE )
ShadersTest.kill("A linking error occured in a shader program.");
final String[] uniformNames = { "uniformA", "uniformB" };
// Get uniform block index and data size
final int blockIndex = glGetUniformBlockIndex(programID, "test");
- final int blockSize = glGetActiveUniformBlock(programID, blockIndex, GL_UNIFORM_BLOCK_DATA_SIZE);
+ final int blockSize = glGetActiveUniformBlocki(programID, blockIndex, GL_UNIFORM_BLOCK_DATA_SIZE);
System.out.println("blockSize = " + blockSize);
Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/sprites/SpriteShootout.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/sprites/SpriteShootout.java 2012-08-18 11:46:25 UTC (rev 3786)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/sprites/SpriteShootout.java 2012-08-18 14:00:45 UTC (rev 3787)
@@ -394,8 +394,8 @@
" gl_FragColor = texture2D(COLOR_MAP, gl_PointCoord);\n" +
"}");
glCompileShader(fshID);
- if ( glGetShader(fshID, GL_COMPILE_STATUS) == GL_FALSE ) {
- System.out.println(glGetShaderInfoLog(fshID, glGetShader(fshID, GL_INFO_LOG_LENGTH)));
+ if ( glGetShaderi(fshID, GL_COMPILE_STATUS) == GL_FALSE ) {
+ System.out.println(glGetShaderInfoLog(fshID, glGetShaderi(fshID, GL_INFO_LOG_LENGTH)));
throw new RuntimeException("Failed to compile fragment shader.");
}
@@ -403,8 +403,8 @@
glAttachShader(progID, vshID);
glAttachShader(progID, fshID);
glLinkProgram(progID);
- if ( glGetProgram(progID, GL_LINK_STATUS) == GL_FALSE ) {
- System.out.println(glGetProgramInfoLog(progID, glGetProgram(progID, GL_INFO_LOG_LENGTH)));
+ if ( glGetProgrami(progID, GL_LINK_STATUS) == GL_FALSE ) {
+ System.out.println(glGetProgramInfoLog(progID, glGetProgrami(progID, GL_INFO_LOG_LENGTH)));
throw new RuntimeException("Failed to link shader program.");
}
@@ -491,8 +491,8 @@
" gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;\n" +
"}");
glCompileShader(vshID);
- if ( glGetShader(vshID, GL_COMPILE_STATUS) == GL_FALSE ) {
- System.out.println(glGetShaderInfoLog(vshID, glGetShader(vshID, GL_INFO_LOG_LENGTH)));
+ if ( glGetShaderi(vshID, GL_COMPILE_STATUS) == GL_FALSE ) {
+ System.out.println(glGetShaderInfoLog(vshID, glGetShaderi(vshID, GL_INFO_LOG_LENGTH)));
throw new RuntimeException("Failed to compile vertex shader.");
}
@@ -635,8 +635,8 @@
" gl_Position = vec4(animC, anim.zw);\n" +
"}");
glCompileShader(vshID);
- if ( glGetShader(vshID, GL_COMPILE_STATUS) == GL_FALSE ) {
- System.out.println(glGetShaderInfoLog(vshID, glGetShader(vshID, GL_INFO_LOG_LENGTH)));
+ if ( glGetShaderi(vshID, GL_COMPILE_STATUS) == GL_FALSE ) {
+ System.out.println(glGetShaderInfoLog(vshID, glGetShaderi(vshID, GL_INFO_LOG_LENGTH)));
throw new RuntimeException("Failed to compile vertex shader.");
}
@@ -644,8 +644,8 @@
glAttachShader(progIDTF, vshID);
glTransformFeedbackVaryings(progIDTF, new CharSequence[] { "gl_Position" }, GL_SEPARATE_ATTRIBS);
glLinkProgram(progIDTF);
- if ( glGetProgram(progIDTF, GL_LINK_STATUS) == GL_FALSE ) {
- System.out.println(glGetProgramInfoLog(progIDTF, glGetProgram(progIDTF, GL_INFO_LOG_LENGTH)));
+ if ( glGetProgrami(progIDTF, GL_LINK_STATUS) == GL_FALSE ) {
+ System.out.println(glGetProgramInfoLog(progIDTF, glGetProgrami(progIDTF, GL_INFO_LOG_LENGTH)));
throw new RuntimeException("Failed to link shader program.");
}
@@ -663,8 +663,8 @@
" gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;\n" +
"}");
glCompileShader(this.vshID);
- if ( glGetShader(this.vshID, GL_COMPILE_STATUS) == GL_FALSE ) {
- System.out.println(glGetShaderInfoLog(this.vshID, glGetShader(this.vshID, GL_INFO_LOG_LENGTH)));
+ if ( glGetShaderi(this.vshID, GL_COMPILE_STATUS) == GL_FALSE ) {
+ System.out.println(glGetShaderInfoLog(this.vshID, glGetShaderi(this.vshID, GL_INFO_LOG_LENGTH)));
throw new RuntimeException("Failed to compile vertex shader.");
}
Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/sprites/SpriteShootout2P.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/sprites/SpriteShootout2P.java 2012-08-18 11:46:25 UTC (rev 3786)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/sprites/SpriteShootout2P.java 2012-08-18 14:00:45 UTC (rev 3787)
@@ -392,8 +392,8 @@
" gl_FragColor = texture2D(COLOR_MAP, gl_PointCoord);\n" +
"}");
glCompileShader(fshID);
- if ( glGetShader(fshID, GL_COMPILE_STATUS) == GL_FALSE ) {
- System.out.println(glGetShaderInfoLog(fshID, glGetShader(fshID, GL_INFO_LOG_LENGTH)));
+ if ( glGetShaderi(fshID, GL_COMPILE_STATUS) == GL_FALSE ) {
+ System.out.println(glGetShaderInfoLog(fshID, glGetShaderi(fshID, GL_INFO_LOG_LENGTH)));
throw new RuntimeException("Failed to compile fragment shader.");
}
@@ -401,8 +401,8 @@
glAttachShader(progID, vshID);
glAttachShader(progID, fshID);
glLinkProgram(progID);
- if ( glGetProgram(progID, GL_LINK_STATUS) == GL_FALSE ) {
- System.out.println(glGetProgramInfoLog(progID, glGetProgram(progID, GL_INFO_LOG_LENGTH)));
+ if ( glGetProgrami(progID, GL_LINK_STATUS) == GL_FALSE ) {
+ System.out.println(glGetProgramInfoLog(progID, glGetProgrami(progID, GL_INFO_LOG_LENGTH)));
throw new RuntimeException("Failed to link shader program.");
}
@@ -456,8 +456,8 @@
" gl_Position = vec4(animC, anim.zw);\n" +
"}");
glCompileShader(vshID);
- if ( glGetShader(vshID, GL_COMPILE_STATUS) == GL_FALSE ) {
- System.out.println(glGetShaderInfoLog(vshID, glGetShader(vshID, GL_INFO_LOG_LENGTH)));
+ if ( glGetShaderi(vshID, GL_COMPILE_STATUS) == GL_FALSE ) {
+ System.out.println(glGetShaderInfoLog(vshID, glGetShaderi(vshID, GL_INFO_LOG_LENGTH)));
throw new RuntimeException("Failed to compile vertex shader.");
}
@@ -465,8 +465,8 @@
glAttachShader(progIDTF, vshID);
glTransformFeedbackVaryings(progIDTF, new CharSequence[] { "gl_Position" }, GL_SEPARATE_ATTRIBS);
glLinkProgram(progIDTF);
- if ( glGetProgram(progIDTF, GL_LINK_STATUS) == GL_FALSE ) {
- System.out.println(glGetProgramInfoLog(progIDTF, glGetProgram(progIDTF, GL_INFO_LOG_LENGTH)));
+ if ( glGetProgrami(progIDTF, GL_LINK_STATUS) == GL_FALSE ) {
+ System.out.println(glGetProgramInfoLog(progIDTF, glGetProgrami(progIDTF, GL_INFO_LOG_LENGTH)));
throw new RuntimeException("Failed to link shader program.");
}
@@ -486,8 +486,8 @@
" gl_Position = gl_ModelViewProjectionMatrix * vec4(gl_Vertex.xy, depth, gl_Vertex.w);\n" +
"}");
glCompileShader(vshID);
- if ( glGetShader(vshID, GL_COMPILE_STATUS) == GL_FALSE ) {
- System.out.println(glGetShaderInfoLog(vshID, glGetShader(vshID, GL_INFO_LOG_LENGTH)));
+ if ( glGetShaderi(vshID, GL_COMPILE_STATUS) == GL_FALSE ) {
+ System.out.println(glGetShaderInfoLog(vshID, glGetShaderi(vshID, GL_INFO_LOG_LENGTH)));
throw new RuntimeException("Failed to compile vertex shader.");
}
Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/sprites/SpriteShootoutCL.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/sprites/SpriteShootoutCL.java 2012-08-18 11:46:25 UTC (rev 3786)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/sprites/SpriteShootoutCL.java 2012-08-18 14:00:45 UTC (rev 3787)
@@ -464,8 +464,8 @@
" gl_FragColor = texture2D(COLOR_MAP, gl_PointCoord);\n" +
"}");
glCompileShader(fshID);
- if ( glGetShader(fshID, GL_COMPILE_STATUS) == GL_FALSE ) {
- System.out.println(glGetShaderInfoLog(fshID, glGetShader(fshID, GL_INFO_LOG_LENGTH)));
+ if ( glGetShaderi(fshID, GL_COMPILE_STATUS) == GL_FALSE ) {
+ System.out.println(glGetShaderInfoLog(fshID, glGetShaderi(fshID, GL_INFO_LOG_LENGTH)));
throw new RuntimeException("Failed to compile fragment shader.");
}
@@ -473,8 +473,8 @@
glAttachShader(progID, vshID);
glAttachShader(progID, fshID);
glLinkProgram(progID);
- if ( glGetProgram(progID, GL_LINK_STATUS) == GL_FALSE ) {
- System.out.println(glGetProgramInfoLog(progID, glGetProgram(progID, GL_INFO_LOG_LENGTH)));
+ if ( glGetProgrami(progID, GL_LINK_STATUS) == GL_FALSE ) {
+ System.out.println(glGetProgramInfoLog(progID, glGetProgrami(progID, GL_INFO_LOG_LENGTH)));
throw new RuntimeException("Failed to link shader program.");
}
@@ -534,8 +534,8 @@
" gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;\n" +
"}");
glCompileShader(vshID);
- if ( glGetShader(vshID, GL_COMPILE_STATUS) == GL_FALSE ) {
- System.out.println(glGetShaderInfoLog(vshID, glGetShader(vshID, GL_INFO_LOG_LENGTH)));
+ if ( glGetShaderi(vshID, GL_COMPILE_STATUS) == GL_FALSE ) {
+ System.out.println(glGetShaderInfoLog(vshID, glGetShaderi(vshID, GL_INFO_LOG_LENGTH)));
throw new RuntimeException("Failed to compile vertex shader.");
}
Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/sprites/SpriteShootoutMapped.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/sprites/SpriteShootoutMapped.java 2012-08-18 11:46:25 UTC (rev 3786)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/sprites/SpriteShootoutMapped.java 2012-08-18 14:00:45 UTC (rev 3787)
@@ -445,8 +445,8 @@
" gl_FragColor = texture2D(COLOR_MAP, gl_PointCoord);\n" +
"}");
glCompileShader(fshID);
- if ( glGetShader(fshID, GL_COMPILE_STATUS) == GL_FALSE ) {
- System.out.println(glGetShaderInfoLog(fshID, glGetShader(fshID, GL_INFO_LOG_LENGTH)));
+ if ( glGetShaderi(fshID, GL_COMPILE_STATUS) == GL_FALSE ) {
+ System.out.println(glGetShaderInfoLog(fshID, glGetShaderi(fshID, GL_INFO_LOG_LENGTH)));
throw new RuntimeException("Failed to compile fragment shader.");
}
@@ -454,8 +454,8 @@
glAttachShader(progID, vshID);
glAttachShader(progID, fshID);
glLinkProgram(progID);
- if ( glGetProgram(progID, GL_LINK_STATUS) == GL_FALSE ) {
- System.out.println(glGetProgramInfoLog(progID, glGetProgram(progID, GL_INFO_LOG_LENGTH)));
+ if ( glGetProgrami(progID, GL_LINK_STATUS) == GL_FALSE ) {
+ System.out.println(glGetProgramInfoLog(progID, glGetProgrami(progID, GL_INFO_LOG_LENGTH)));
throw new RuntimeException("Failed to link shader program.");
}
@@ -487,8 +487,8 @@
" gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;\n" +
"}");
glCompileShader(vshID);
- if ( glGetShader(vshID, GL_COMPILE_STATUS) == GL_FALSE ) {
- System.out.println(glGetShaderInfoLog(vshID, glGetShader(vshID, GL_INFO_LOG_LENGTH)));
+ if ( glGetShaderi(vshID, GL_COMPILE_STATUS) == GL_FALSE ) {
+ System.out.println(glGetShaderInfoLog(vshID, glGetShaderi(vshID, GL_INFO_LOG_LENGTH)));
throw new RuntimeException("Failed to compile vertex shader.");
}
@@ -708,8 +708,8 @@
" gl_Position = vec4(animC, anim.zw);\n" +
"}");
glCompileShader(vshID);
- if ( glGetShader(vshID, GL_COMPILE_STATUS) == GL_FALSE ) {
- System.out.println(glGetShaderInfoLog(vshID, glGetShader(vshID, GL_INFO_LOG_LENGTH)));
+ if ( glGetShaderi(vshID, GL_COMPILE_STATUS) == GL_FALSE ) {
+ System.out.println(glGetShaderInfoLog(vshID, glGetShaderi(vshID, GL_INFO_LOG_LENGTH)));
throw new RuntimeException("Failed to compile vertex shader.");
}
@@ -717,8 +717,8 @@
glAttachShader(progIDTF, vshID);
glTransformFeedbackVaryings(progIDTF, new CharSequence[] { "gl_Position" }, GL_SEPARATE_ATTRIBS);
glLinkProgram(progIDTF);
- if ( glGetProgram(progIDTF, GL_LINK_STATUS) == GL_FALSE ) {
- System.out.println(glGetProgramInfoLog(progIDTF, glGetProgram(progIDTF, GL_INFO_LOG_LENGTH)));
+ if ( glGetProgrami(progIDTF, GL_LINK_STATUS) == GL_FALSE ) {
+ System.out.println(glGetProgramInfoLog(progIDTF, glGetProgrami(progIDTF, GL_INFO_LOG_LENGTH)));
throw new RuntimeException("Failed to link shader program.");
}
@@ -736,8 +736,8 @@
" gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;\n" +
"}");
glCompileShader(this.vshID);
- if ( glGetShader(this.vshID, GL_COMPILE_STATUS) == GL_FALSE ) {
- System.out.println(glGetShaderInfoLog(this.vshID, glGetShader(this.vshID, GL_INFO_LOG_LENGTH)));
+ if ( glGetShaderi(this.vshID, GL_COMPILE_STATUS) == GL_FALSE ) {
+ System.out.println(glGetShaderInfoLog(this.vshID, glGetShaderi(this.vshID, GL_INFO_LOG_LENGTH)));
throw new RuntimeException("Failed to compile vertex shader.");
}
Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/Shader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/Shader.java 2012-08-18 11:46:25 UTC (rev 3786)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/Shader.java 2012-08-18 14:00:45 UTC (rev 3787)
@@ -75,7 +75,7 @@
glCompileShader(ID);
- if ( glGetShader(ID, GL_COMPILE_STATUS) == GL_FALSE ) {
+ if ( glGetShaderi(ID, GL_COMPILE_STATUS) == GL_FALSE ) {
printInfoLog();
destroy();
throw new RuntimeException("A compilation error occured in a shader.");
@@ -86,7 +86,7 @@
if ( ID == 0 )
throw new IllegalStateException("The shader has not been created");
- final int logLength = glGetShader(ID, GL_INFO_LOG_LENGTH);
+ final int logLength = glGetShaderi(ID, GL_INFO_LOG_LENGTH);
if ( logLength <= 1 )
return;
Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/ShaderProgram.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/ShaderProgram.java 2012-08-18 11:46:25 UTC (rev 3786)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengles/util/ShaderProgram.java 2012-08-18 14:00:45 UTC (rev 3787)
@@ -14,7 +14,7 @@
glLinkProgram(ID);
- if ( glGetProgram(ID, GL_LINK_STATUS) == GL_FALSE ) {
+ if ( glGetProgrami(ID, GL_LINK_STATUS) == GL_FALSE ) {
printInfoLog();
destroy();
throw new RuntimeException("Failed to link a Shader Program: " + ID);
@@ -24,7 +24,7 @@
public void validate() {
glValidateProgram(ID);
- final boolean error = glGetProgram(ID, GL_VALIDATE_STATUS) == GL_FALSE;
+ final boolean error = glGetProgrami(ID, GL_VALIDATE_STATUS) == GL_FALSE;
if ( error ) {
printInfoLog();
@@ -67,7 +67,7 @@
}
private void printInfoLog() {
- final int logLength = glGetProgram(ID, GL_INFO_LOG_LENGTH);
+ final int logLength = glGetProgrami(ID, GL_INFO_LOG_LENGTH);
System.out.println(logLength);
if ( logLength <= 1 )
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_subroutine.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_subroutine.java 2012-08-18 11:46:25 UTC (rev 3786)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_subroutine.java 2012-08-18 14:00:45 UTC (rev 3787)
@@ -76,7 +76,7 @@
@Reuse("GL40")
@Alternate("glGetActiveSubroutineUniformiv")
@GLreturn("values")
- @StripPostfix("values")
+ @StripPostfix(value = "values", postfix = "v")
void glGetActiveSubroutineUniformiv2(@GLuint int program, @GLenum int shadertype, @GLuint int index, @GLenum int pname,
@OutParameter IntBuffer values);
@@ -125,7 +125,7 @@
@Reuse("GL40")
@Alternate("glGetProgramStageiv")
@GLreturn("values")
- @StripPostfix("values")
+ @StripPostfix(value = "values", postfix = "v")
void glGetProgramStageiv2(@GLuint int program, @GLenum int shadertype, @GLenum int pname, @OutParameter IntBuffer values);
}
\ No newline at end of file
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java 2012-08-18 11:46:25 UTC (rev 3786)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java 2012-08-18 14:00:45 UTC (rev 3787)
@@ -109,7 +109,7 @@
@Reuse("GL32")
@Alternate("glGetSynciv")
@GLreturn("values")
- @StripPostfix("values")
+ @StripPostfix(value = "values", postfix = "v")
void glGetSynciv2(@PointerWrapper("GLsync") GLSync sync, @GLenum int pname, @Constant("1") @GLsizei int bufSize,
@OutParameter @GLsizei @Constant("0L") IntBuffer length,
@OutParameter IntBuffer values);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
