From 46922c02993786578aa57bc6e343df7a20485530 Mon Sep 17 00:00:00 2001 From: Ioannis Tsakpinis Date: Fri, 4 May 2012 17:23:36 +0000 Subject: [PATCH] GL spec 20120427 updates. --- src/templates/org/lwjgl/opengl/GL11.java | 10 +++++----- src/templates/org/lwjgl/opengl/GL13.java | 2 +- src/templates/org/lwjgl/opengl/GL14.java | 2 +- src/templates/org/lwjgl/opengl/GL31.java | 7 +++++-- src/templates/org/lwjgl/opengl/GL40.java | 8 +++++--- src/templates/org/lwjgl/opengl/GL41.java | 8 ++++---- 6 files changed, 21 insertions(+), 16 deletions(-) diff --git a/src/templates/org/lwjgl/opengl/GL11.java b/src/templates/org/lwjgl/opengl/GL11.java index 7337a04c..7fabb94e 100644 --- a/src/templates/org/lwjgl/opengl/GL11.java +++ b/src/templates/org/lwjgl/opengl/GL11.java @@ -719,9 +719,9 @@ public interface GL11 { void glAccum(@GLenum int op, float value); @DeprecatedGL - void glAlphaFunc(@GLenum int func, @GLclampf float ref); + void glAlphaFunc(@GLenum int func, float ref); - void glClearColor(@GLclampf float red, @GLclampf float green, @GLclampf float blue, @GLclampf float alpha); + void glClearColor(float red, float green, float blue, float alpha); @DeprecatedGL void glClearAccum(float red, float green, float blue, float alpha); @@ -755,7 +755,7 @@ public interface GL11 { @GLuint IntBuffer textures, @Const @Check("textures.remaining()") - @GLclampf FloatBuffer priorities); + FloatBuffer priorities); @DeprecatedGL boolean glAreTexturesResident(@AutoSize("textures") @GLsizei int n, @@ -776,7 +776,7 @@ public interface GL11 { @NoErrorCheck void glArrayElement(int i); - void glClearDepth(@GLclampd double depth); + void glClearDepth(double depth); @DeprecatedGL void glDeleteLists(@GLuint int list, @GLsizei int range); @@ -918,7 +918,7 @@ public interface GL11 { void glDrawArrays(@GLenum int mode, int first, @GLsizei int count); - void glDepthRange(@GLclampd double zNear, @GLclampd double zFar); + void glDepthRange(double zNear, double zFar); void glDepthMask(boolean flag); diff --git a/src/templates/org/lwjgl/opengl/GL13.java b/src/templates/org/lwjgl/opengl/GL13.java index 0baf4de8..9fed1012 100644 --- a/src/templates/org/lwjgl/opengl/GL13.java +++ b/src/templates/org/lwjgl/opengl/GL13.java @@ -253,6 +253,6 @@ public interface GL13 { @DeprecatedGL void glMultTransposeMatrixd(@Check("16") @Const DoubleBuffer m); - void glSampleCoverage(@GLclampf float value, boolean invert); + void glSampleCoverage(float value, boolean invert); } diff --git a/src/templates/org/lwjgl/opengl/GL14.java b/src/templates/org/lwjgl/opengl/GL14.java index a92e7877..f961a015 100644 --- a/src/templates/org/lwjgl/opengl/GL14.java +++ b/src/templates/org/lwjgl/opengl/GL14.java @@ -97,7 +97,7 @@ public interface GL14 { void glBlendEquation(@GLenum int mode); - void glBlendColor(@GLclampf float red, @GLclampf float green, @GLclampf float blue, @GLclampf float alpha); + void glBlendColor(float red, float green, float blue, float alpha); @DeprecatedGL void glFogCoordf(float coord); diff --git a/src/templates/org/lwjgl/opengl/GL31.java b/src/templates/org/lwjgl/opengl/GL31.java index 9bccc952..2592477f 100644 --- a/src/templates/org/lwjgl/opengl/GL31.java +++ b/src/templates/org/lwjgl/opengl/GL31.java @@ -76,8 +76,11 @@ public interface GL31 { // ----------------------[ EXT_copy_buffer ]---------------------- // --------------------------------------------------------------- - int GL_COPY_READ_BUFFER = 0x8F36; - int GL_COPY_WRITE_BUFFER = 0x8F37; + int GL_COPY_READ_BUFFER_BINDING = 0x8F36; + int GL_COPY_WRITE_BUFFER_BINDING = 0x8F37; + + int GL_COPY_READ_BUFFER = GL_COPY_READ_BUFFER_BINDING; + int GL_COPY_WRITE_BUFFER = GL_COPY_WRITE_BUFFER_BINDING; void glCopyBufferSubData(@GLenum int readtarget, @GLenum int writetarget, @GLintptr long readoffset, @GLintptr long writeoffset, @GLsizeiptr long size); diff --git a/src/templates/org/lwjgl/opengl/GL40.java b/src/templates/org/lwjgl/opengl/GL40.java index 4c2f94f4..5b2177ac 100644 --- a/src/templates/org/lwjgl/opengl/GL40.java +++ b/src/templates/org/lwjgl/opengl/GL40.java @@ -184,7 +184,7 @@ public interface GL40 { */ int GL_MIN_SAMPLE_SHADING_VALUE = 0x8C37; - void glMinSampleShading(@GLclampf float value); + void glMinSampleShading(float value); // --------------------------------------------------------------------- // ----------------------[ ARB_shader_subroutine ]---------------------- @@ -394,8 +394,10 @@ public interface GL40 { * Accepted by the <pname> parameter of GetBooleanv, GetDoublev, GetIntegerv, * and GetFloatv: */ - int GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED = 0x8E23; - int GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE = 0x8E24; + int GL_TRANSFORM_FEEDBACK_PAUSED = 0x8E23; + int GL_TRANSFORM_FEEDBACK_ACTIVE = 0x8E24; + int GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED = GL_TRANSFORM_FEEDBACK_PAUSED; + int GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE = GL_TRANSFORM_FEEDBACK_ACTIVE; int GL_TRANSFORM_FEEDBACK_BINDING = 0x8E25; void glBindTransformFeedback(@GLenum int target, @GLuint int id); diff --git a/src/templates/org/lwjgl/opengl/GL41.java b/src/templates/org/lwjgl/opengl/GL41.java index 557c210e..c2d2017e 100644 --- a/src/templates/org/lwjgl/opengl/GL41.java +++ b/src/templates/org/lwjgl/opengl/GL41.java @@ -77,9 +77,9 @@ public interface GL41 { @OutParameter @Check("2") IntBuffer range, @OutParameter @Check("1") IntBuffer precision); - void glDepthRangef(@GLclampf float n, @GLclampf float f); + void glDepthRangef(float n, float f); - void glClearDepthf(@GLclampf float d); + void glClearDepthf(float d); // ---------------------------------------------------------------------- // ----------------------[ ARB_get_program_binary ]---------------------- @@ -447,9 +447,9 @@ public interface GL41 { void glScissorIndexedv(@GLuint int index, @Check("4") @Const IntBuffer v); @StripPostfix("v") - void glDepthRangeArrayv(@GLuint int first, @AutoSize(value = "v", expression = " >> 1") @GLsizei int count, @Const @GLclampd DoubleBuffer v); + void glDepthRangeArrayv(@GLuint int first, @AutoSize(value = "v", expression = " >> 1") @GLsizei int count, @Const DoubleBuffer v); - void glDepthRangeIndexed(@GLuint int index, @GLclampd double n, @GLclampd double f); + void glDepthRangeIndexed(@GLuint int index, double n, double f); @StripPostfix("data") void glGetFloati_v(@GLenum int target, @GLuint int index, @Check @OutParameter FloatBuffer data);