|
From: <sp...@us...> - 2008-08-11 23:05:18
|
Revision: 3109
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3109&view=rev
Author: spasi
Date: 2008-08-11 23:05:10 +0000 (Mon, 11 Aug 2008)
Log Message:
-----------
First batch of OpenGL 3.0 functionality. (WIP)
Modified Paths:
--------------
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_color_buffer_float.java
Added Paths:
-----------
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_depth_buffer_float.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_draw_instanced.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_framebuffer_sRGB.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_geometry_shader4.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_half_float_vertex.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_instanced_arrays.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_map_buffer_range.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_buffer_object.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_compression_rgtc.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_rg.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_array_object.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_transform_feedback.java
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_color_buffer_float.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_color_buffer_float.java 2008-07-02 20:00:49 UTC (rev 3108)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_color_buffer_float.java 2008-08-11 23:05:10 UTC (rev 3109)
@@ -31,9 +31,10 @@
*/
package org.lwjgl.opengl;
-import org.lwjgl.util.generator.*;
+import org.lwjgl.util.generator.GLenum;
public interface ARB_color_buffer_float {
+
/**
* Accepted by the <pname> parameters of GetBooleanv, GetIntegerv,
* GetFloatv, and GetDoublev:
@@ -48,9 +49,7 @@
int GL_CLAMP_FRAGMENT_COLOR_ARB = 0x891B;
int GL_CLAMP_READ_COLOR_ARB = 0x891C;
- /**
- * Accepted by the <clamp> parameter of ClampColorARB.
- */
+ /** Accepted by the <clamp> parameter of ClampColorARB. */
int GL_FIXED_ONLY_ARB = 0x891D;
/**
@@ -59,18 +58,17 @@
* <piValues> parameter array of wglGetPixelFormatAttribivARB, and the
* <pfValues> parameter array of wglGetPixelFormatAttribfvARB:
*/
- //int WGL_TYPE_RGBA_FLOAT_ARB = 0x21A0;
+ int WGL_TYPE_RGBA_FLOAT_ARB = 0x21A0;
/**
* Accepted as values of the <render_type> arguments in the
* glXCreateNewContext and glXCreateContext functions
*/
- //int GLX_RGBA_FLOAT_TYPE = 0x20B9;
+ int GLX_RGBA_FLOAT_TYPE = 0x20B9;
- /**
- * Accepted as a bit set in the GLX_RENDER_TYPE variable
- */
- //int GLX_RGBA_FLOAT_BIT = 0x00000004;
+ /** Accepted as a bit set in the GLX_RENDER_TYPE variable */
+ int GLX_RGBA_FLOAT_BIT = 0x00000004;
void glClampColorARB(@GLenum int target, @GLenum int clamp);
-}
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_depth_buffer_float.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_depth_buffer_float.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_depth_buffer_float.java 2008-08-11 23:05:10 UTC (rev 3109)
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2002-2008 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opengl;
+
+public interface ARB_depth_buffer_float {
+
+ /**
+ * Accepted by the <internalformat> parameter of TexImage1D, TexImage2D,
+ * TexImage3D, CopyTexImage1D, CopyTexImage2D, and RenderbufferStorageEXT,
+ * and returned in the <data> parameter of GetTexLevelParameter and
+ * GetRenderbufferParameterivEXT:
+ */
+ int GL_DEPTH_COMPONENT32F = 0x8CAC;
+ int GL_DEPTH32F_STENCIL8 = 0x8CAD;
+
+ /**
+ * Accepted by the <type> parameter of DrawPixels, ReadPixels, TexImage1D,
+ * TexImage2D, TexImage3D, TexSubImage1D, TexSubImage2D, TexSubImage3D, and
+ * GetTexImage:
+ */
+ int GL_FLOAT_32_UNSIGNED_INT_24_8_REV = 0x8DAD;
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_draw_instanced.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_draw_instanced.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_draw_instanced.java 2008-08-11 23:05:10 UTC (rev 3109)
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2002-2008 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opengl;
+
+import org.lwjgl.util.generator.*;
+
+import java.nio.Buffer;
+
+public interface ARB_draw_instanced {
+
+ void glDrawArraysInstancedARB(@GLenum int mode, int first, @GLsizei int count, @GLsizei int primcount);
+
+ void glDrawElementsInstancedARB(@GLenum int mode, @AutoSize("indices") @GLsizei int count, @AutoType("indices") @GLenum int type,
+ @BufferObject(BufferKind.ElementVBO)
+ @Const
+ @GLubyte
+ @GLushort
+ @GLuint Buffer indices, @GLsizei int primcount);
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_framebuffer_sRGB.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_framebuffer_sRGB.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_framebuffer_sRGB.java 2008-08-11 23:05:10 UTC (rev 3109)
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2002-2008 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opengl;
+
+public interface ARB_framebuffer_sRGB {
+
+ /**
+ * Accepted by the <attribList> parameter of glXChooseVisual, and by
+ * the <attrib> parameter of glXGetConfig:
+ */
+ int GLX_FRAMEBUFFER_SRGB_CAPABLE_ARB = 0x20B2;
+
+ /**
+ * Accepted by the <piAttributes> parameter of
+ * wglGetPixelFormatAttribivEXT, wglGetPixelFormatAttribfvEXT, and
+ * the <piAttribIList> and <pfAttribIList> of wglChoosePixelFormatEXT:
+ */
+ int WGL_FRAMEBUFFER_SRGB_CAPABLE_ARB = 0x20A9;
+
+ /**
+ * Accepted by the <cap> parameter of Enable, Disable, and IsEnabled,
+ * and by the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv,
+ * and GetDoublev:
+ */
+ int GL_FRAMEBUFFER_SRGB_ARB = 0x8DB9;
+
+ /**
+ * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
+ * GetFloatv, and GetDoublev:
+ */
+ int GL_FRAMEBUFFER_SRGB_CAPABLE_ARB = 0x8DBA;
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_geometry_shader4.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_geometry_shader4.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_geometry_shader4.java 2008-08-11 23:05:10 UTC (rev 3109)
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2002-2008 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opengl;
+
+import org.lwjgl.util.generator.GLenum;
+import org.lwjgl.util.generator.GLuint;
+
+public interface ARB_geometry_shader4 {
+
+ /**
+ * Accepted by the <type> parameter of CreateShader and returned by the
+ * <params> parameter of GetShaderiv:
+ */
+ int GL_GEOMETRY_SHADER_ARB = 0x8DD9;
+
+ /**
+ * Accepted by the <pname> parameter of ProgramParameteriEXT and
+ * GetProgramiv:
+ */
+ int GL_GEOMETRY_VERTICES_OUT_ARB = 0x8DDA;
+ int GL_GEOMETRY_INPUT_TYPE_ARB = 0x8DDB;
+ int GL_GEOMETRY_OUTPUT_TYPE_ARB = 0x8DDC;
+
+ /**
+ * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
+ * GetFloatv, and GetDoublev:
+ */
+ int GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB = 0x8C29;
+ int GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB = 0x8DDD;
+ int GL_MAX_VERTEX_VARYING_COMPONENTS_ARB = 0x8DDE;
+ int GL_MAX_VARYING_COMPONENTS_ARB = 0x8B4B;
+ int GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB = 0x8DDF;
+ int GL_MAX_GEOMETRY_OUTPUT_VERTICES_ARB = 0x8DE0;
+ int GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB = 0x8DE1;
+
+ /**
+ * Accepted by the <mode> parameter of Begin, DrawArrays,
+ * MultiDrawArrays, DrawElements, MultiDrawElements, and
+ * DrawRangeElements:
+ */
+ int GL_LINES_ADJACENCY_ARB = 0xA;
+ int GL_LINE_STRIP_ADJACENCY_ARB = 0xB;
+ int GL_TRIANGLES_ADJACENCY_ARB = 0xC;
+ int GL_TRIANGLE_STRIP_ADJACENCY_ARB = 0xD;
+
+ /** Returned by CheckFramebufferStatusEXT: */
+ int GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_ARB = 0x8DA8;
+ int GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB = 0x8DA9;
+
+ /**
+ * Accepted by the <pname> parameter of GetFramebufferAttachment-
+ * ParameterivEXT:
+ */
+ int GL_FRAMEBUFFER_ATTACHMENT_LAYERED_ARB = 0x8DA7;
+ int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_ARB = 0x8CD4;
+
+ /**
+ * Accepted by the <cap> parameter of Enable, Disable, and IsEnabled,
+ * and by the <pname> parameter of GetIntegerv, GetFloatv, GetDoublev,
+ * and GetBooleanv:
+ */
+ int GL_PROGRAM_POINT_SIZE_ARB = 0x8642;
+
+ void glProgramParameteriARB(@GLuint int program, @GLenum int pname, int value);
+
+ void glFramebufferTextureARB(@GLenum int target, @GLenum int attachment, @GLuint int texture, int level);
+
+ void glFramebufferTextureLayerARB(@GLenum int target, @GLenum int attachment, @GLuint int texture, int level, int layer);
+
+ void glFramebufferTextureFaceARB(@GLenum int target, @GLenum int attachment, @GLuint int texture, int level, @GLenum int face);
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_half_float_vertex.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_half_float_vertex.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_half_float_vertex.java 2008-08-11 23:05:10 UTC (rev 3109)
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2002-2008 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opengl;
+
+public interface ARB_half_float_vertex {
+
+ /**
+ * Accepted by the <type> argument of VertexPointer, NormalPointer,
+ * ColorPointer, SecondaryColorPointer, FogCoordPointer, TexCoordPointer,
+ * and VertexAttribPointer:
+ */
+ int GL_HALF_FLOAT = 0x140B;
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_instanced_arrays.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_instanced_arrays.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_instanced_arrays.java 2008-08-11 23:05:10 UTC (rev 3109)
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2002-2008 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opengl;
+
+import org.lwjgl.util.generator.GLuint;
+
+public interface ARB_instanced_arrays {
+
+ /**
+ * Accepted by the <pname> parameters of GetVertexAttribdv,
+ * GetVertexAttribfv, and GetVertexAttribiv:
+ */
+ int GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB = 0x88FE;
+
+ void glVertexAttribDivisorARB(@GLuint int index, @GLuint int divisor);
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_map_buffer_range.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_map_buffer_range.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_map_buffer_range.java 2008-08-11 23:05:10 UTC (rev 3109)
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2002-2008 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opengl;
+
+import org.lwjgl.util.generator.*;
+
+import java.nio.ByteBuffer;
+
+public interface ARB_map_buffer_range {
+
+ /** Accepted by the <access> parameter of MapBufferRange: */
+ int GL_MAP_READ_BIT = 0x0001;
+ int GL_MAP_WRITE_BIT = 0x0002;
+ int GL_MAP_INVALIDATE_RANGE_BIT = 0x0004;
+ int GL_MAP_INVALIDATE_BUFFER_BIT = 0x0008;
+ int GL_MAP_FLUSH_EXPLICIT_BIT = 0x0010;
+ int GL_MAP_UNSYNCHRONIZED_BIT = 0x0020;
+
+ @CachedResult
+ @GLvoid
+ ByteBuffer
+ glMapBufferRange(@GLenum int target, @GLintptr long offset, @GLsizeiptr long length, @GLbitfield int access);
+
+ void glFlushMappedBufferRange(@GLenum int target, @GLintptr long offset, @GLsizeiptr long length);
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_buffer_object.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_buffer_object.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_buffer_object.java 2008-08-11 23:05:10 UTC (rev 3109)
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2002-2008 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opengl;
+
+import org.lwjgl.util.generator.GLenum;
+import org.lwjgl.util.generator.GLuint;
+
+public interface ARB_texture_buffer_object {
+
+ /**
+ * Accepted by the <target> parameter of BindBuffer, BufferData,
+ * BufferSubData, MapBuffer, MapBufferRangeARB, BindTexture, UnmapBuffer,
+ * GetBufferSubData, GetBufferParameteriv, GetBufferPointerv, and TexBufferARB,
+ * and the <pname> parameter of GetBooleanv, GetDoublev, GetFloatv, and
+ * GetIntegerv:
+ */
+ int GL_TEXTURE_BUFFER_ARB = 0x8C2A;
+
+ /**
+ * Accepted by the <pname> parameters of GetBooleanv, GetDoublev,
+ * GetFloatv, and GetIntegerv:
+ */
+ int GL_MAX_TEXTURE_BUFFER_SIZE_ARB = 0x8C2B;
+ int GL_TEXTURE_BINDING_BUFFER_ARB = 0x8C2C;
+ int GL_TEXTURE_BUFFER_DATA_STORE_BINDING_ARB = 0x8C2D;
+ int GL_TEXTURE_BUFFER_FORMAT_ARB = 0x8C2E;
+
+ void glTexBufferARB(@GLenum int target, @GLenum int internalformat, @GLuint int buffer);
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_compression_rgtc.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_compression_rgtc.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_compression_rgtc.java 2008-08-11 23:05:10 UTC (rev 3109)
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2002-2008 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opengl;
+
+import org.lwjgl.util.generator.Extension;
+
+@Extension(postfix = "ARB", className = "ARBTextureCompressionRGTC")
+public interface ARB_texture_compression_rgtc {
+
+ /**
+ * Accepted by the <internalformat> parameter of TexImage2D,
+ * CopyTexImage2D, and CompressedTexImage2D and the <format> parameter
+ * of CompressedTexSubImage2D:
+ */
+ int GL_COMPRESSED_RED_RGTC1 = 0x8DBB;
+ int GL_COMPRESSED_SIGNED_RED_RGTC1 = 0x8DBC;
+ int GL_COMPRESSED_RED_GREEN_RGTC2 = 0x8DBD;
+ int GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2 = 0x8DBE;
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_rg.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_rg.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_rg.java 2008-08-11 23:05:10 UTC (rev 3109)
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2002-2008 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT O...
[truncated message content] |
|
From: <sp...@us...> - 2009-03-27 12:56:23
|
Revision: 3193
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3193&view=rev
Author: spasi
Date: 2009-03-27 12:56:14 +0000 (Fri, 27 Mar 2009)
Log Message:
-----------
Added support for ARB_copy_buffer and updated the GL31 copy buffer tokens.
Modified Paths:
--------------
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java
Added Paths:
-----------
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_copy_buffer.java
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_copy_buffer.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_copy_buffer.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_copy_buffer.java 2009-03-27 12:56:14 UTC (rev 3193)
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2002-2008 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opengl;
+
+import org.lwjgl.util.generator.GLenum;
+import org.lwjgl.util.generator.GLintptr;
+import org.lwjgl.util.generator.GLsizeiptr;
+
+public interface ARB_copy_buffer {
+
+ /**
+ * Accepted by the target parameters of BindBuffer, BufferData,
+ * BufferSubData, MapBuffer, UnmapBuffer, GetBufferSubData,
+ * GetBufferPointerv, MapBufferRange, FlushMappedBufferRange,
+ * GetBufferParameteriv, BindBufferRange, BindBufferBase,
+ * and CopyBufferSubData:
+ */
+ int GL_COPY_READ_BUFFER = 0x8F36;
+ int GL_COPY_WRITE_BUFFER = 0x8F37;
+
+ void glCopyBufferSubData(@GLenum int readTarget, @GLenum int writeTarget,
+ @GLintptr long readOffset, @GLintptr long writeOffset,
+ @GLsizeiptr long size);
+
+}
\ No newline at end of file
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java 2009-03-26 11:15:43 UTC (rev 3192)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java 2009-03-27 12:56:14 UTC (rev 3193)
@@ -74,8 +74,8 @@
// ----------------------[ EXT_copy_buffer ]----------------------
// ---------------------------------------------------------------
- int GL_COPY_READ_BUFFER = 0x0; // TODO: Find this value
- int GL_COPY_WRITE_BUFFER = 0x0; // TODO: Find this value
+ int GL_COPY_READ_BUFFER = 0x8F36;
+ int GL_COPY_WRITE_BUFFER = 0x8F37;
void glCopyBufferSubData(@GLenum int readtarget, @GLenum int writetarget, @GLintptr long readoffset, @GLintptr long writeoffset, @GLsizeiptr long size);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2009-04-29 16:38:15
|
Revision: 3205
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3205&view=rev
Author: spasi
Date: 2009-04-29 16:38:04 +0000 (Wed, 29 Apr 2009)
Log Message:
-----------
Added support for NV_shader_buffer_load and NV_vertex_buffer_unified_memory.
Added Paths:
-----------
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_shader_buffer_load.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_vertex_buffer_unified_memory.java
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_shader_buffer_load.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_shader_buffer_load.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_shader_buffer_load.java 2009-04-29 16:38:04 UTC (rev 3205)
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2002-2008 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opengl;
+
+import org.lwjgl.util.generator.*;
+
+import java.nio.LongBuffer;
+
+public interface NV_shader_buffer_load {
+
+ /**
+ * Accepted by the <pname> parameter of GetBufferParameterui64vNV,
+ * GetNamedBufferParameterui64vNV:
+ */
+ int GL_BUFFER_GPU_ADDRESS_NV = 0x8F1D;
+
+ /** Returned by the <type> parameter of GetActiveUniform: */
+ int GL_GPU_ADDRESS_NV = 0x8F34;
+
+ /** Accepted by the <value> parameter of GetIntegerui64vNV: */
+ int GL_MAX_SHADER_BUFFER_ADDRESS_NV = 0x8F35;
+
+ void glMakeBufferResidentNV(@GLenum int target, @GLenum int access);
+
+ void glMakeBufferNonResidentNV(@GLenum int target);
+
+ boolean glIsBufferResidentNV(@GLenum int target);
+
+ void glNamedMakeBufferResidentNV(@GLuint int buffer, @GLenum int access);
+
+ void glNamedMakeBufferNonResidentNV(@GLuint int buffer);
+
+ boolean glIsNamedBufferResidentNV(@GLuint int buffer);
+
+ @StripPostfix("params")
+ void glGetBufferParameterui64vNV(@GLenum int target, @GLenum int pname, @OutParameter @Check("1") @GLuint64EXT LongBuffer params);
+
+ @StripPostfix("params")
+ void glGetNamedBufferParameterui64vNV(@GLuint int buffer, @GLenum int pname, @OutParameter @Check("1") @GLuint64EXT LongBuffer params);
+
+ @StripPostfix("result")
+ void glGetIntegerui64vNV(@GLenum int value, @OutParameter @Check("1") @GLuint64EXT LongBuffer result);
+
+ void glUniformui64NV(int location, @GLuint64EXT long value);
+
+ @StripPostfix("value")
+ void glUniformui64vNV(int location, @AutoSize("value") @GLsizei int count, @GLuint64EXT LongBuffer value);
+
+ @StripPostfix("params")
+ void glGetUniformui64vNV(@GLuint int program, int location, @OutParameter @Check("1") @GLuint64EXT LongBuffer params);
+
+ void glProgramUniformui64NV(@GLuint int program, int location, @GLuint64EXT long value);
+
+ @StripPostfix("value")
+ void glProgramUniformui64vNV(@GLuint int program, int location, @AutoSize("value") @GLsizei int count, @GLuint64EXT LongBuffer value);
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_vertex_buffer_unified_memory.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_vertex_buffer_unified_memory.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_vertex_buffer_unified_memory.java 2009-04-29 16:38:04 UTC (rev 3205)
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2002-2008 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opengl;
+
+import org.lwjgl.util.generator.*;
+
+import java.nio.LongBuffer;
+
+public interface NV_vertex_buffer_unified_memory {
+
+ /**
+ * Accepted by the <cap> parameter of DisableClientState,
+ * EnableClientState, IsEnabled:
+ */
+ int GL_VERTEX_ATTRIB_ARRAY_UNIFIED_NV = 0x8F1E;
+ int GL_ELEMENT_ARRAY_UNIFIED_NV = 0x8F1F;
+
+ /**
+ * Accepted by the <pname> parameter of BufferAddressRangeNV
+ * and the <value> parameter of GetIntegerui64i_vNV:
+ */
+ int GL_VERTEX_ATTRIB_ARRAY_ADDRESS_NV = 0x8F20;
+ int GL_TEXTURE_COORD_ARRAY_ADDRESS_NV = 0x8F25;
+
+ /**
+ * Accepted by the <pname> parameter of BufferAddressRangeNV
+ * and the <value> parameter of GetIntegerui64vNV:
+ */
+ int GL_VERTEX_ARRAY_ADDRESS_NV = 0x8F21;
+ int GL_NORMAL_ARRAY_ADDRESS_NV = 0x8F22;
+ int GL_COLOR_ARRAY_ADDRESS_NV = 0x8F23;
+ int GL_INDEX_ARRAY_ADDRESS_NV = 0x8F24;
+ int GL_EDGE_FLAG_ARRAY_ADDRESS_NV = 0x8F26;
+ int GL_SECONDARY_COLOR_ARRAY_ADDRESS_NV = 0x8F27;
+ int GL_FOG_COORD_ARRAY_ADDRESS_NV = 0x8F28;
+ int GL_ELEMENT_ARRAY_ADDRESS_NV = 0x8F29;
+
+ /** Accepted by the <target> parameter of GetIntegeri_vNV: */
+ int GL_VERTEX_ATTRIB_ARRAY_LENGTH_NV = 0x8F2A;
+ int GL_TEXTURE_COORD_ARRAY_LENGTH_NV = 0x8F2F;
+
+ /** Accepted by the <value> parameter of GetIntegerv: */
+ int GL_VERTEX_ARRAY_LENGTH_NV = 0x8F2B;
+ int GL_NORMAL_ARRAY_LENGTH_NV = 0x8F2C;
+ int GL_COLOR_ARRAY_LENGTH_NV = 0x8F2D;
+ int GL_INDEX_ARRAY_LENGTH_NV = 0x8F2E;
+ int GL_EDGE_FLAG_ARRAY_LENGTH_NV = 0x8F30;
+ int GL_SECONDARY_COLOR_ARRAY_LENGTH_NV = 0x8F31;
+ int GL_FOG_COORD_ARRAY_LENGTH_NV = 0x8F32;
+ int GL_ELEMENT_ARRAY_LENGTH_NV = 0x8F33;
+
+ void glBufferAddressRangeNV(@GLenum int pname, @GLuint int index, @GLuint64EXT long address, @GLsizeiptr long length);
+
+ void glVertexFormatNV(int size, @GLenum int type, @GLsizei int stride);
+
+ void glNormalFormatNV(@GLenum int type, @GLsizei int stride);
+
+ void glColorFormatNV(int size, @GLenum int type, @GLsizei int stride);
+
+ void glIndexFormatNV(@GLenum int type, @GLsizei int stride);
+
+ void glTexCoordFormatNV(int size, @GLenum int type, @GLsizei int stride);
+
+ void glEdgeFlagFormatNV(@GLsizei int stride);
+
+ void glSecondaryColorFormatNV(int size, @GLenum int type, @GLsizei int stride);
+
+ void glFogCoordFormatNV(@GLenum int type, @GLsizei int stride);
+
+ void glVertexAttribFormatNV(@GLuint int index, int size, @GLenum int type, boolean normalized, @GLsizei int stride);
+
+ void glVertexAttribIFormatNV(@GLuint int index, int size, @GLenum int type, @GLsizei int stride);
+
+ @StripPostfix("result")
+ void glGetIntegerui64i_vNV(@GLenum int value, @GLuint int index, @OutParameter @Check("1") @GLuint64EXT LongBuffer result);
+
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2009-06-02 12:43:54
|
Revision: 3219
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3219&view=rev
Author: spasi
Date: 2009-06-02 12:40:57 +0000 (Tue, 02 Jun 2009)
Log Message:
-----------
Added missing @OutParameters
Modified Paths:
--------------
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_objects.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_objects.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_objects.java 2009-05-31 10:12:19 UTC (rev 3218)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_objects.java 2009-06-02 12:40:57 UTC (rev 3219)
@@ -186,12 +186,14 @@
@OutParameter
@Check(value = "1", canBeNull = true)
@GLsizei IntBuffer length,
+ @OutParameter
@GLcharARB ByteBuffer infoLog);
void glGetAttachedObjectsARB(@GLhandleARB int containerObj, @AutoSize("obj") @GLsizei int maxCount,
@OutParameter
@Check(value = "1", canBeNull = true)
@GLsizei IntBuffer count,
+ @OutParameter
@GLhandleARB IntBuffer obj);
/**
@@ -209,6 +211,7 @@
@Check("1") IntBuffer size,
@Check("1")
@GLenum IntBuffer type,
+ @OutParameter
@GLcharARB ByteBuffer name);
@StripPostfix("params")
@@ -221,5 +224,6 @@
@OutParameter
@Check(value = "1", canBeNull = true)
@GLsizei IntBuffer length,
+ @OutParameter
@GLcharARB ByteBuffer source);
}
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java 2009-05-31 10:12:19 UTC (rev 3218)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java 2009-06-02 12:40:57 UTC (rev 3219)
@@ -202,18 +202,21 @@
@OutParameter
@GLsizei
@Check(value = "1", canBeNull = true) IntBuffer length,
- @GLchar ByteBuffer infoLog);
+ @OutParameter
+ @GLchar ByteBuffer infoLog);
void glGetProgramInfoLog(@GLuint int program, @AutoSize("infoLog") @GLsizei int maxLength,
@OutParameter
@GLsizei
@Check(value = "1", canBeNull = true) IntBuffer length,
+ @OutParameter
@GLchar ByteBuffer infoLog);
void glGetAttachedShaders(@GLuint int program, @AutoSize("shaders") @GLsizei int maxCount,
@OutParameter
@GLsizei
@Check(value = "1", canBeNull = true) IntBuffer count,
+ @OutParameter
@GLuint IntBuffer shaders);
/**
@@ -241,9 +244,10 @@
@StripPostfix("params")
void glGetUniformiv(@GLuint int program, int location, @OutParameter @Check IntBuffer params);
- void glGetShaderSource(@GLuint int shader, @OutParameter @AutoSize("source") @GLsizei int maxLength,
+ void glGetShaderSource(@GLuint int shader, @AutoSize("source") @GLsizei int maxLength,
@Check(value = "1", canBeNull = true)
@GLsizei IntBuffer length,
+ @OutParameter
@GLchar ByteBuffer source);
// ------------------------------------------------------------------
@@ -358,9 +362,8 @@
@Check(value = "1", canBeNull = true)
@GLsizei IntBuffer length,
@Check("1") IntBuffer size,
- @Check("1")
- @GLenum IntBuffer type,
- @Const
+ @Check("1") @GLenum IntBuffer type,
+ @OutParameter
@GLchar ByteBuffer name);
int glGetAttribLocation(@GLuint int program, @NullTerminated @Const @GLchar ByteBuffer name);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2009-09-29 13:51:49
|
Revision: 3243
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3243&view=rev
Author: spasi
Date: 2009-09-29 13:51:41 +0000 (Tue, 29 Sep 2009)
Log Message:
-----------
Minor fixes and added support for NV_texture_barrier.
Modified Paths:
--------------
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java
Added Paths:
-----------
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_texture_barrier.java
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java 2009-09-27 12:05:46 UTC (rev 3242)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java 2009-09-29 13:51:41 UTC (rev 3243)
@@ -36,6 +36,7 @@
import java.nio.ByteBuffer;
import java.nio.IntBuffer;
+@Extension(postfix = "")
public interface ARB_uniform_buffer_object {
/**
@@ -43,92 +44,92 @@
* BufferSubData, MapBuffer, UnmapBuffer, GetBufferSubData, and
* GetBufferPointerv:
*/
- int GL_UNIFORM_BUFFER_ARB = 0x8A11;
+ int GL_UNIFORM_BUFFER = 0x8A11;
/**
* Accepted by the <pname> parameter of GetIntegeri_v, GetBooleanv,
* GetIntegerv, GetFloatv, and GetDoublev:
*/
- int GL_UNIFORM_BUFFER_BINDING_ARB = 0x8A28;
+ int GL_UNIFORM_BUFFER_BINDING = 0x8A28;
/** Accepted by the <pname> parameter of GetIntegeri_v: */
- int GL_UNIFORM_BUFFER_START_ARB = 0x8A29;
- int GL_UNIFORM_BUFFER_SIZE_ARB = 0x8A2A;
+ int GL_UNIFORM_BUFFER_START = 0x8A29;
+ int GL_UNIFORM_BUFFER_SIZE = 0x8A2A;
/**
* Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
* GetFloatv, and GetDoublev:
*/
- int GL_MAX_VERTEX_UNIFORM_BLOCKS_ARB = 0x8A2B;
- int GL_MAX_GEOMETRY_UNIFORM_BLOCKS_ARB = 0x8A2C;
- int GL_MAX_FRAGMENT_UNIFORM_BLOCKS_ARB = 0x8A2D;
- int GL_MAX_COMBINED_UNIFORM_BLOCKS_ARB = 0x8A2E;
- int GL_MAX_UNIFORM_BUFFER_BINDINGS_ARB = 0x8A2F;
- int GL_MAX_UNIFORM_BLOCK_SIZE_ARB = 0x8A30;
- int GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS_ARB = 0x8A31;
- int GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS_ARB = 0x8A32;
- int GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS_ARB = 0x8A33;
- int GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT_ARB = 0x8A34;
+ int GL_MAX_VERTEX_UNIFORM_BLOCKS = 0x8A2B;
+ int GL_MAX_GEOMETRY_UNIFORM_BLOCKS = 0x8A2C;
+ int GL_MAX_FRAGMENT_UNIFORM_BLOCKS = 0x8A2D;
+ int GL_MAX_COMBINED_UNIFORM_BLOCKS = 0x8A2E;
+ int GL_MAX_UNIFORM_BUFFER_BINDINGS = 0x8A2F;
+ int GL_MAX_UNIFORM_BLOCK_SIZE = 0x8A30;
+ int GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS = 0x8A31;
+ int GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS = 0x8A32;
+ int GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS = 0x8A33;
+ int GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT = 0x8A34;
/** Accepted by the <pname> parameter of GetProgramiv: */
- int GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH_ARB = 0x8A35;
- int GL_ACTIVE_UNIFORM_BLOCKS_ARB = 0x8A36;
+ int GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH = 0x8A35;
+ int GL_ACTIVE_UNIFORM_BLOCKS = 0x8A36;
/** Accepted by the <pname> parameter of GetActiveUniformsivARB: */
- int GL_UNIFORM_TYPE_ARB = 0x8A37;
- int GL_UNIFORM_SIZE_ARB = 0x8A38;
- int GL_UNIFORM_NAME_LENGTH_ARB = 0x8A39;
- int GL_UNIFORM_BLOCK_INDEX_ARB = 0x8A3A;
- int GL_UNIFORM_OFFSET_ARB = 0x8A3B;
- int GL_UNIFORM_ARRAY_STRIDE_ARB = 0x8A3C;
- int GL_UNIFORM_MATRIX_STRIDE_ARB = 0x8A3D;
- int GL_UNIFORM_IS_ROW_MAJOR_ARB = 0x8A3E;
+ int GL_UNIFORM_TYPE = 0x8A37;
+ int GL_UNIFORM_SIZE = 0x8A38;
+ int GL_UNIFORM_NAME_LENGTH = 0x8A39;
+ int GL_UNIFORM_BLOCK_INDEX = 0x8A3A;
+ int GL_UNIFORM_OFFSET = 0x8A3B;
+ int GL_UNIFORM_ARRAY_STRIDE = 0x8A3C;
+ int GL_UNIFORM_MATRIX_STRIDE = 0x8A3D;
+ int GL_UNIFORM_IS_ROW_MAJOR = 0x8A3E;
/** Accepted by the <pname> parameter of GetActiveUniformBlockivARB: */
- int GL_UNIFORM_BLOCK_BINDING_ARB = 0x8A3F;
- int GL_UNIFORM_BLOCK_DATA_SIZE_ARB = 0x8A40;
- int GL_UNIFORM_BLOCK_NAME_LENGTH_ARB = 0x8A41;
- int GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS_ARB = 0x8A42;
- int GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES_ARB = 0x8A43;
- int GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER_ARB = 0x8A44;
- int GL_UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER_ARB = 0x8A45;
- int GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER_ARB = 0x8A46;
+ int GL_UNIFORM_BLOCK_BINDING = 0x8A3F;
+ int GL_UNIFORM_BLOCK_DATA_SIZE = 0x8A40;
+ int GL_UNIFORM_BLOCK_NAME_LENGTH = 0x8A41;
+ int GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS = 0x8A42;
+ int GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES = 0x8A43;
+ int GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER = 0x8A44;
+ int GL_UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER = 0x8A45;
+ int GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER = 0x8A46;
/** Returned by GetActiveUniformsivARB and GetUniformBlockIndexARB */
- int GL_INVALID_INDEX_ARB = 0xFFFFFFFF; // TODO: Check if this is correct
+ int GL_INVALID_INDEX = 0xFFFFFFFF;
- void glGetUniformIndicesARB(@GLuint int program, @AutoSize("uniformIndices") @GLsizei int uniformCount,
- @Const @NullTerminated @GLchar ByteBuffer uniformNames,
- @OutParameter @GLuint IntBuffer uniformIndices);
+ void glGetUniformIndices(@GLuint int program, @AutoSize("uniformIndices") @GLsizei int uniformCount,
+ @Const @NullTerminated @GLchar ByteBuffer uniformNames,
+ @OutParameter @GLuint IntBuffer uniformIndices);
@StripPostfix("params")
- void glGetActiveUniformsivARB(@GLuint int program, @AutoSize("uniformIndices") @GLsizei int uniformCount,
- @Const @GLuint IntBuffer uniformIndices,
- @GLenum int pname,
- @Check(value = "1") @GLint IntBuffer params); // TODO: We need to AutoSize "params" using "uniformCount"
+ void glGetActiveUniformsiv(@GLuint int program, @AutoSize("uniformIndices") @GLsizei int uniformCount,
+ @Const @GLuint IntBuffer uniformIndices,
+ @GLenum int pname,
+ @Check(value = "1") @GLint IntBuffer params); // TODO: We need to AutoSize "params" using "uniformCount"
- void glGetActiveUniformNameARB(@GLuint int program, @GLuint int uniformIndex, @AutoSize("uniformName") @GLsizei int bufSize,
- @OutParameter @Check(value = "1", canBeNull = true) @GLsizei IntBuffer length,
- @GLchar ByteBuffer uniformName);
+ void glGetActiveUniformName(@GLuint int program, @GLuint int uniformIndex, @AutoSize("uniformName") @GLsizei int bufSize,
+ @OutParameter @Check(value = "1", canBeNull = true) @GLsizei IntBuffer length,
+ @GLchar ByteBuffer uniformName);
@GLuint
- int glGetUniformBlockIndexARB(@GLuint int program, @Const @NullTerminated @GLchar ByteBuffer uniformBlockName);
+ int glGetUniformBlockIndex(@GLuint int program, @Const @NullTerminated @GLchar ByteBuffer uniformBlockName);
@StripPostfix("params")
- void glGetActiveUniformBlockivARB(@GLuint int program, @GLuint int uniformBlockIndex, @GLenum int pname,
- @OutParameter @Check(value = "16") @GLint IntBuffer params);
+ void glGetActiveUniformBlockiv(@GLuint int program, @GLuint int uniformBlockIndex, @GLenum int pname,
+ @OutParameter @Check(value = "16") @GLint IntBuffer params);
- void glGetActiveUniformBlockNameARB(@GLuint int program, @GLuint int uniformBlockIndex, @AutoSize("uniformBlockName") @GLsizei int bufSize,
- @OutParameter @Check(value = "1", canBeNull = true) @GLsizei IntBuffer length,
- @GLchar ByteBuffer uniformBlockName);
+ void glGetActiveUniformBlockName(@GLuint int program, @GLuint int uniformBlockIndex, @AutoSize("uniformBlockName") @GLsizei int bufSize,
+ @OutParameter @Check(value = "1", canBeNull = true) @GLsizei IntBuffer length,
+ @GLchar ByteBuffer uniformBlockName);
void glBindBufferRange(@GLenum int target, @GLuint int index, @GLuint int buffer, @GLintptr long offset, @GLsizeiptr long size);
void glBindBufferBase(@GLenum int target, @GLuint int index, @GLuint int buffer);
@StripPostfix(value = "data", extension = "")
- void glGetIntegeri_v(@GLenum int value, @GLuint int index, @OutParameter @Check("4")IntBuffer data);
+ void glGetIntegeri_v(@GLenum int value, @GLuint int index, @OutParameter @Check("4") IntBuffer data);
- void glUniformBlockBindingARB(@GLuint int program, @GLuint int uniformBlockIndex, @GLuint int uniformBlockBinding);
+ void glUniformBlockBinding(@GLuint int program, @GLuint int uniformBlockIndex, @GLuint int uniformBlockBinding);
}
\ No newline at end of file
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java 2009-09-27 12:05:46 UTC (rev 3242)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java 2009-09-29 13:51:41 UTC (rev 3243)
@@ -262,8 +262,7 @@
/** Accepted by the <clamp> parameter of ClampColor. */
int GL_FIXED_ONLY = 0x891D;
- // TODO: ClampColor without the ARB postfix not present in NV driver atm.
- void glClampColorARB(@GLenum int target, @GLenum int clamp);
+ void glClampColor(@GLenum int target, @GLenum int clamp);
// ----------------------------------------------------------------------
// ----------------------[ NV_depth_buffer_float ]----------------------
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java 2009-09-27 12:05:46 UTC (rev 3242)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java 2009-09-29 13:51:41 UTC (rev 3243)
@@ -231,7 +231,7 @@
int GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER = 0x8A46;
/** Returned by GetActiveUniformsiv and GetUniformBlockIndex */
- int GL_INVALID_INDEX = 0xFFFFFFFF; // TODO: Check if this is correct
+ int GL_INVALID_INDEX = 0xFFFFFFFF;
void glGetUniformIndices(@GLuint int program, @AutoSize("uniformIndices") @GLsizei int uniformCount,
@Const @NullTerminated @GLchar ByteBuffer uniformNames,
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java 2009-09-27 12:05:46 UTC (rev 3242)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java 2009-09-29 13:51:41 UTC (rev 3243)
@@ -253,14 +253,10 @@
*/
int GL_PROGRAM_POINT_SIZE = 0x8642;
- void glProgramParameteri(@GLuint int program, @GLenum int pname, int value);
-
void glFramebufferTexture(@GLenum int target, @GLenum int attachment, @GLuint int texture, int level);
void glFramebufferTextureLayer(@GLenum int target, @GLenum int attachment, @GLuint int texture, int level, int layer);
- void glFramebufferTextureFace(@GLenum int target, @GLenum int attachment, @GLuint int texture, int level, @GLenum int face);
-
// --------------------------------------------------------
// ----------------------[ ARB_sync ]----------------------
// --------------------------------------------------------
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_texture_barrier.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_texture_barrier.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_texture_barrier.java 2009-09-29 13:51:41 UTC (rev 3243)
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2002-2008 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opengl;
+
+public interface NV_texture_barrier {
+
+ void glTextureBarrierNV();
+
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2009-12-28 15:00:15
|
Revision: 3261
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3261&view=rev
Author: spasi
Date: 2009-12-28 15:00:06 +0000 (Mon, 28 Dec 2009)
Log Message:
-----------
Fixed MapBufferRange signature.
Modified Paths:
--------------
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_map_buffer_range.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_map_buffer_range.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_map_buffer_range.java 2009-12-04 04:49:19 UTC (rev 3260)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_map_buffer_range.java 2009-12-28 15:00:06 UTC (rev 3261)
@@ -47,8 +47,8 @@
@CachedResult
@GLvoid
- ByteBuffer
- glMapBufferRange(@GLenum int target, @GLintptr long offset, @GLsizeiptr long length, @GLbitfield int access);
+ @AutoResultSize("length")
+ ByteBuffer glMapBufferRange(@GLenum int target, @GLintptr long offset, @GLsizeiptr long length, @GLbitfield int access);
void glFlushMappedBufferRange(@GLenum int target, @GLintptr long offset, @GLsizeiptr long length);
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java 2009-12-04 04:49:19 UTC (rev 3260)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java 2009-12-28 15:00:06 UTC (rev 3261)
@@ -1286,6 +1286,7 @@
@Dependent("OpenGL30")
@CachedResult
@GLvoid
+ @AutoResultSize("length")
ByteBuffer glMapNamedBufferRangeEXT(@GLuint int buffer, @GLintptr long offset, @GLsizeiptr long length, @GLbitfield int access);
@Dependent("OpenGL30")
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java 2009-12-04 04:49:19 UTC (rev 3260)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java 2009-12-28 15:00:06 UTC (rev 3261)
@@ -242,8 +242,8 @@
@CachedResult
@GLvoid
- ByteBuffer
- glMapBufferRange(@GLenum int target, @GLintptr long offset, @GLsizeiptr long length, @GLbitfield int access);
+ @AutoResultSize("length")
+ ByteBuffer glMapBufferRange(@GLenum int target, @GLintptr long offset, @GLsizeiptr long length, @GLbitfield int access);
void glFlushMappedBufferRange(@GLenum int target, @GLintptr long offset, @GLsizeiptr long length);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2010-04-07 11:59:39
|
Revision: 3312
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3312&view=rev
Author: spasi
Date: 2010-04-07 11:59:33 +0000 (Wed, 07 Apr 2010)
Log Message:
-----------
More glGetActive changes.
Modified Paths:
--------------
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_objects.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_transform_feedback.java
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_objects.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_objects.java 2010-04-07 10:28:05 UTC (rev 3311)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_objects.java 2010-04-07 11:59:33 UTC (rev 3312)
@@ -219,40 +219,39 @@
@OutParameter @GLenum @Check("1") IntBuffer type,
@OutParameter @GLcharARB ByteBuffer name);
+ /** Overloads glGetActiveUniformARB. This version returns both size and type in the sizeType buffer (at .position() and .position() + 1). */
@Alternate("glGetActiveUniformARB")
@GLreturn(value = "name", maxLength = "maxLength")
void glGetActiveUniformARB2(@GLhandleARB int programObj, @GLuint int index, @GLsizei int maxLength,
@OutParameter @GLsizei @Constant("name_length, 0") IntBuffer length,
- @OutParameter @Check("1") IntBuffer size,
- @OutParameter @GLenum @Check("1") IntBuffer type,
- @OutParameter @GLcharARB ByteBuffer name);
-
- /** This version returns both size and type in the sizeType buffer (at .position() and .position() + 1). */
- @Alternate("glGetActiveUniformARB")
- @GLreturn(value = "name", maxLength = "maxLength")
- void glGetActiveUniformARB3(@GLhandleARB int programObj, @GLuint int index, @GLsizei int maxLength,
- @OutParameter @GLsizei @Constant("name_length, 0") IntBuffer length,
@OutParameter @Check("2") IntBuffer sizeType,
@OutParameter @GLenum @Constant("sizeType, sizeType.position() + 1") IntBuffer type,
@OutParameter @GLcharARB ByteBuffer name);
- /** This version returns only the uniform size. */
+ /** Overloads glGetActiveUniformARB. This version returns only the uniform name. */
@Alternate(value = "glGetActiveUniformARB", javaAlt = true)
+ @GLreturn(value = "name", maxLength = "maxLength")
+ void glGetActiveUniformARB(@GLhandleARB int programObj, @GLuint int index, @GLsizei int maxLength,
+ @OutParameter @GLsizei @Constant("name_length, 0, APIUtils.getBufferInt(), 0, APIUtils.getBufferInt(), 1") IntBuffer length,
+ @OutParameter @GLcharARB ByteBuffer name);
+
+ /** Overloads glGetActiveUniformARB. This version returns only the uniform size. */
+ @Alternate(value = "glGetActiveUniformARB", javaAlt = true)
@GLreturn(value = "size")
void glGetActiveUniformSizeARB(@GLhandleARB int programObj, @GLuint int index, @Constant("0") @GLsizei int maxLength,
@OutParameter @GLsizei @Constant("null, 0") IntBuffer length,
@OutParameter IntBuffer size,
@OutParameter @GLenum @Constant("size, 1") IntBuffer type, // Reuse size buffer and ignore
- @GLcharARB @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
+ @OutParameter @GLcharARB @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
- /** This version returns only the uniform type. */
+ /** Overloads glGetActiveUniformARB. This version returns only the uniform type. */
@Alternate(value = "glGetActiveUniformARB", javaAlt = true)
@GLreturn(value = "type")
void glGetActiveUniformTypeARB(@GLhandleARB int programObj, @GLuint int index, @Constant("0") @GLsizei int maxLength,
@OutParameter @GLsizei @Constant("null, 0") IntBuffer length,
@OutParameter @Constant("type, 1") IntBuffer size, // Reuse type buffer and ignore
@OutParameter @GLenum IntBuffer type,
- @GLcharARB @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
+ @OutParameter @GLcharARB @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
@StripPostfix("params")
void glGetUniformfvARB(@GLhandleARB int programObj, int location, @OutParameter @Check FloatBuffer params);
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java 2010-04-07 10:28:05 UTC (rev 3311)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java 2010-04-07 11:59:33 UTC (rev 3312)
@@ -142,29 +142,39 @@
@OutParameter @GLenum @Check("1") IntBuffer type,
@OutParameter @GLcharARB ByteBuffer name);
+ /** Overloads glGetActiveAttribARB. This version returns both size and type in the sizeType buffer (at .position() and .position() + 1). */
@Alternate("glGetActiveAttribARB")
@GLreturn(value = "name", maxLength = "maxLength")
void glGetActiveAttribARB2(@GLhandleARB int programObj, @GLuint int index, @GLsizei int maxLength,
@OutParameter @GLsizei @Constant("name_length, 0") IntBuffer length,
- @OutParameter @Check("1") IntBuffer size,
- @OutParameter @GLenum @Check("1") IntBuffer type,
+ @OutParameter @Check("2") IntBuffer sizeType,
+ @OutParameter @GLenum @Constant("sizeType, sizeType.position() + 1") IntBuffer type,
@OutParameter @GLcharARB ByteBuffer name);
+ /** Overloads glGetActiveAttribARB. This version returns only the uniform name. */
@Alternate(value = "glGetActiveAttribARB", javaAlt = true)
+ @GLreturn(value = "name", maxLength = "maxLength")
+ void glGetActiveAttribARB(@GLhandleARB int programObj, @GLuint int index, @GLsizei int maxLength,
+ @OutParameter @GLsizei @Constant("name_length, 0, APIUtils.getBufferInt(), 0, APIUtils.getBufferInt(), 1") IntBuffer length,
+ @OutParameter @GLcharARB ByteBuffer name);
+
+ /** Overloads glGetActiveAttribARB. This version returns only the uniform size. */
+ @Alternate(value = "glGetActiveAttribARB", javaAlt = true)
@GLreturn(value = "size")
void glGetActiveAttribSizeARB(@GLhandleARB int programObj, @GLuint int index, @Constant("0") @GLsizei int maxLength,
@OutParameter @GLsizei @Constant("null, 0") IntBuffer length,
@OutParameter IntBuffer size,
@OutParameter @GLenum @Constant("size, 1") IntBuffer type, // Reuse size buffer and ignore
- @GLcharARB @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
+ @OutParameter @GLcharARB @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
+ /** Overloads glGetActiveAttribARB. This version returns only the uniform type. */
@Alternate(value = "glGetActiveAttribARB", javaAlt = true)
@GLreturn(value = "type")
void glGetActiveAttribTypeARB(@GLhandleARB int programObj, @GLuint int index, @Constant("0") @GLsizei int maxLength,
@OutParameter @GLsizei @Constant("null, 0") IntBuffer length,
@OutParameter @Constant("type, 1") IntBuffer size, // Reuse type buffer and ignore
@OutParameter @GLenum IntBuffer type,
- @GLcharARB @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
+ @OutParameter @GLcharARB @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
int glGetAttribLocationARB(@GLhandleARB int programObj, @NullTerminated @Const @GLcharARB ByteBuffer name);
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java 2010-04-07 10:28:05 UTC (rev 3311)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java 2010-04-07 11:59:33 UTC (rev 3312)
@@ -242,40 +242,39 @@
@OutParameter @GLenum @Check("1") IntBuffer type,
@OutParameter @GLchar ByteBuffer name);
+ /** Overloads glGetActiveUniform. This version returns both size and type in the sizeType buffer (at .position() and .position() + 1). */
@Alternate("glGetActiveUniform")
@GLreturn(value = "name", maxLength = "maxLength")
void glGetActiveUniform2(@GLuint int program, @GLuint int index, @GLsizei int maxLength,
@OutParameter @GLsizei @Constant("name_length, 0") IntBuffer length,
- @OutParameter @GLsizei @Check("1") IntBuffer size,
- @OutParameter @GLenum @Check("1") IntBuffer type,
- @OutParameter @GLchar ByteBuffer name);
-
- /** This version returns both size and type in the sizeType buffer (at .position() and .position() + 1). */
- @Alternate("glGetActiveUniform")
- @GLreturn(value = "name", maxLength = "maxLength")
- void glGetActiveUniform3(@GLuint int program, @GLuint int index, @GLsizei int maxLength,
- @OutParameter @GLsizei @Constant("name_length, 0") IntBuffer length,
@OutParameter @Check("2") IntBuffer sizeType,
@OutParameter @GLenum @Constant("sizeType, sizeType.position() + 1") IntBuffer type,
@OutParameter @GLchar ByteBuffer name);
- /** This version returns only the uniform size. */
+ /** Overloads glGetActiveUniformARB. This version returns only the uniform name. */
@Alternate(value = "glGetActiveUniform", javaAlt = true)
+ @GLreturn(value = "name", maxLength = "maxLength")
+ void glGetActiveUniform(@GLuint int program, @GLuint int index, @GLsizei int maxLength,
+ @OutParameter @GLsizei @Constant("name_length, 0, APIUtils.getBufferInt(), 0, APIUtils.getBufferInt(), 1") IntBuffer length,
+ @OutParameter @GLchar ByteBuffer name);
+
+ /** Overloads glGetActiveUniform. This version returns only the uniform size. */
+ @Alternate(value = "glGetActiveUniform", javaAlt = true)
@GLreturn(value = "size")
void glGetActiveUniformSize(@GLuint int program, @GLuint int index, @Constant("0") @GLsizei int maxLength,
@OutParameter @GLsizei @Constant("null, 0") IntBuffer length,
@OutParameter IntBuffer size,
@OutParameter @GLenum @Constant("size, 1") IntBuffer type, // Reuse size buffer and ignore
- @GLchar @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
+ @OutParameter @GLchar @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
- /** This version returns only the uniform type. */
+ /** Overloads glGetActiveUniform. This version returns only the uniform type. */
@Alternate(value = "glGetActiveUniform", javaAlt = true)
@GLreturn(value = "type")
void glGetActiveUniformType(@GLuint int program, @GLuint int index, @Constant("0") @GLsizei int maxLength,
@OutParameter @GLsizei @Constant("null, 0") IntBuffer length,
@OutParameter @Constant("type, 1") IntBuffer size, // Reuse type buffer and ignore
@OutParameter @GLenum IntBuffer type,
- @GLchar @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
+ @OutParameter @GLchar @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
@StripPostfix("params")
void glGetUniformfv(@GLuint int program, int location, @OutParameter @Check FloatBuffer params);
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_transform_feedback.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_transform_feedback.java 2010-04-07 10:28:05 UTC (rev 3311)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_transform_feedback.java 2010-04-07 11:59:33 UTC (rev 3312)
@@ -137,14 +137,40 @@
@OutParameter @GLenum @Check("1") IntBuffer type,
@OutParameter @GLchar ByteBuffer name);
+ /** Overloads glGetActiveVaryingNV. This version returns both size and type in the sizeType buffer (at .position() and .position() + 1). */
@Alternate("glGetActiveVaryingNV")
@GLreturn(value = "name", maxLength = "bufSize")
void glGetActiveVaryingNV2(@GLuint int program, @GLuint int index, @GLsizei int bufSize,
@OutParameter @GLsizei @Constant("name_length, 0") IntBuffer length,
- @OutParameter @GLsizei @Check("1") IntBuffer size,
- @OutParameter @GLenum @Check("1") IntBuffer type,
+ @OutParameter @Check("2") IntBuffer sizeType,
+ @OutParameter @GLenum @Constant("sizeType, sizeType.position() + 1") IntBuffer type,
@OutParameter @GLchar ByteBuffer name);
+ /** Overloads glGetActiveVaryingNV. This version returns only the varying name. */
+ @Alternate(value = "glGetActiveVaryingNV", javaAlt = true)
+ @GLreturn(value = "name", maxLength = "bufSize")
+ void glGetActiveVaryingNV(@GLuint int program, @GLuint int index, @GLsizei int bufSize,
+ @OutParameter @GLsizei @Constant("name_length, 0, APIUtils.getBufferInt(), 0, APIUtils.getBufferInt(), 1") IntBuffer length,
+ @OutParameter @GLchar ByteBuffer name);
+
+ /** Overloads glGetActiveVaryingNV. This version returns only the varying size. */
+ @Alternate(value = "glGetActiveVaryingNV", javaAlt = true)
+ @GLreturn(value = "size")
+ void glGetActiveVaryingSizeNV(@GLuint int program, @GLuint int index, @Constant("0") @GLsizei int bufSize,
+ @OutParameter @GLsizei @Constant("null, 0") IntBuffer length,
+ @OutParameter IntBuffer size,
+ @OutParameter @GLenum @Constant("size, 1") IntBuffer type, // Reuse size buffer and ignore
+ @OutParameter @GLchar @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
+
+ /** Overloads glGetActiveVaryingNV. This version returns only the varying type. */
+ @Alternate(value = "glGetActiveVaryingNV", javaAlt = true)
+ @GLreturn(value = "type")
+ void glGetActiveVaryingTypeNV(@GLuint int program, @GLuint int index, @Constant("0") @GLsizei int bufSize,
+ @OutParameter @GLsizei @Constant("null, 0") IntBuffer length,
+ @OutParameter @Constant("type, 1") IntBuffer size, // Reuse type buffer and ignore
+ @OutParameter @GLenum IntBuffer type,
+ @OutParameter @GLchar @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
+
void glActiveVaryingNV(@GLuint int program, @NullTerminated @Const @GLchar ByteBuffer name);
@Alternate("glActiveVaryingNV")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2010-04-07 12:06:16
|
Revision: 3313
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3313&view=rev
Author: spasi
Date: 2010-04-07 12:06:10 +0000 (Wed, 07 Apr 2010)
Log Message:
-----------
More glGetActive changes.
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 2010-04-07 11:59:33 UTC (rev 3312)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java 2010-04-07 12:06:10 UTC (rev 3313)
@@ -151,14 +151,14 @@
@OutParameter @GLenum @Constant("sizeType, sizeType.position() + 1") IntBuffer type,
@OutParameter @GLcharARB ByteBuffer name);
- /** Overloads glGetActiveAttribARB. This version returns only the uniform name. */
+ /** Overloads glGetActiveAttribARB. This version returns only the attrib name. */
@Alternate(value = "glGetActiveAttribARB", javaAlt = true)
@GLreturn(value = "name", maxLength = "maxLength")
void glGetActiveAttribARB(@GLhandleARB int programObj, @GLuint int index, @GLsizei int maxLength,
@OutParameter @GLsizei @Constant("name_length, 0, APIUtils.getBufferInt(), 0, APIUtils.getBufferInt(), 1") IntBuffer length,
@OutParameter @GLcharARB ByteBuffer name);
- /** Overloads glGetActiveAttribARB. This version returns only the uniform size. */
+ /** Overloads glGetActiveAttribARB. This version returns only the attrib size. */
@Alternate(value = "glGetActiveAttribARB", javaAlt = true)
@GLreturn(value = "size")
void glGetActiveAttribSizeARB(@GLhandleARB int programObj, @GLuint int index, @Constant("0") @GLsizei int maxLength,
@@ -167,7 +167,7 @@
@OutParameter @GLenum @Constant("size, 1") IntBuffer type, // Reuse size buffer and ignore
@OutParameter @GLcharARB @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
- /** Overloads glGetActiveAttribARB. This version returns only the uniform type. */
+ /** Overloads glGetActiveAttribARB. This version returns only the attrib type. */
@Alternate(value = "glGetActiveAttribARB", javaAlt = true)
@GLreturn(value = "type")
void glGetActiveAttribTypeARB(@GLhandleARB int programObj, @GLuint int index, @Constant("0") @GLsizei int maxLength,
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java 2010-04-07 11:59:33 UTC (rev 3312)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java 2010-04-07 12:06:10 UTC (rev 3313)
@@ -404,29 +404,39 @@
@OutParameter @GLenum @Check("1") IntBuffer type,
@OutParameter @GLchar ByteBuffer name);
+ /** Overloads glGetActiveAttrib. This version returns both size and type in the sizeType buffer (at .position() and .position() + 1). */
@Alternate("glGetActiveAttrib")
@GLreturn(value = "name", maxLength = "maxLength")
void glGetActiveAttrib2(@GLuint int program, @GLuint int index, @GLsizei int maxLength,
@OutParameter @GLsizei @Constant("name_length, 0") IntBuffer length,
- @OutParameter @Check("1") IntBuffer size,
- @OutParameter @GLenum @Check("1") IntBuffer type,
+ @OutParameter @Check("2") IntBuffer sizeType,
+ @OutParameter @GLenum @Constant("sizeType, sizeType.position() + 1") IntBuffer type,
@OutParameter @GLchar ByteBuffer name);
+ /** Overloads glGetActiveAttrib. This version returns only the attrib name. */
@Alternate(value = "glGetActiveAttrib", javaAlt = true)
+ @GLreturn(value = "name", maxLength = "maxLength")
+ void glGetActiveAttrib(@GLuint int program, @GLuint int index, @GLsizei int maxLength,
+ @OutParameter @GLsizei @Constant("name_length, 0, APIUtils.getBufferInt(), 0, APIUtils.getBufferInt(), 1") IntBuffer length,
+ @OutParameter @GLchar ByteBuffer name);
+
+ /** Overloads glGetActiveAttribARB. This version returns only the attrib size. */
+ @Alternate(value = "glGetActiveAttrib", javaAlt = true)
@GLreturn(value = "size")
void glGetActiveAttribSize(@GLuint int program, @GLuint int index, @Constant("0") @GLsizei int maxLength,
@OutParameter @GLsizei @Constant("null, 0") IntBuffer length,
@OutParameter IntBuffer size,
@OutParameter @GLenum @Constant("size, 1") IntBuffer type, // Reuse size buffer and ignore
- @GLchar @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
+ @OutParameter @GLchar @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
+ /** Overloads glGetActiveAttrib. This version returns only the attrib type. */
@Alternate(value = "glGetActiveAttrib", javaAlt = true)
@GLreturn(value = "type")
void glGetActiveAttribType(@GLuint int program, @GLuint int index, @Constant("0") @GLsizei int maxLength,
@OutParameter @GLsizei @Constant("null, 0") IntBuffer length,
@OutParameter @Constant("type, 1") IntBuffer size, // Reuse type buffer and ignore
@OutParameter @GLenum IntBuffer type,
- @GLchar @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
+ @OutParameter @GLchar @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
int glGetAttribLocation(@GLuint int program, @NullTerminated @Const @GLchar ByteBuffer name);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2010-04-14 14:58:25
|
Revision: 3325
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3325&view=rev
Author: spasi
Date: 2010-04-14 14:58:18 +0000 (Wed, 14 Apr 2010)
Log Message:
-----------
New extensions: AMD_conservative_depth, EXT_shader_image_load_store, EXT_vertex_attrib_64bit, NV_gpu_program5, NV_gpu_shader5, NV_shader_buffer_store, NV_tessellation_program5, NV_vertex_attrib_integer_64bit
Modified Paths:
--------------
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_program.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_gpu_shader4.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_shader_buffer_load.java
Added Paths:
-----------
trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_conservative_depth.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_shader_image_load_store.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_vertex_attrib_64bit.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_gpu_program5.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_gpu_shader5.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_shader_buffer_store.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_tessellation_program5.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_vertex_attrib_integer_64bit.java
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_conservative_depth.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_conservative_depth.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_conservative_depth.java 2010-04-14 14:58:18 UTC (rev 3325)
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2002-2008 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opengl;
+
+public interface AMD_conservative_depth {
+}
\ No newline at end of file
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_program.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_program.java 2010-04-13 20:28:04 UTC (rev 3324)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_program.java 2010-04-14 14:58:18 UTC (rev 3325)
@@ -137,13 +137,13 @@
void glDisableVertexAttribArrayARB(@GLuint int index);
@StripPostfix("params")
- void glGetVertexAttribfvARB(@GLuint int index, @GLenum int pname, @OutParameter @Check FloatBuffer params);
+ void glGetVertexAttribfvARB(@GLuint int index, @GLenum int pname, @OutParameter @Check("4") FloatBuffer params);
@StripPostfix("params")
- void glGetVertexAttribdvARB(@GLuint int index, @GLenum int pname, @OutParameter @Check DoubleBuffer params);
+ void glGetVertexAttribdvARB(@GLuint int index, @GLenum int pname, @OutParameter @Check("4") DoubleBuffer params);
@StripPostfix("params")
- void glGetVertexAttribivARB(@GLuint int index, @GLenum int pname, @OutParameter @Check IntBuffer params);
+ void glGetVertexAttribivARB(@GLuint int index, @GLenum int pname, @OutParameter @Check("4") IntBuffer params);
@StripPostfix("result")
void glGetVertexAttribPointervARB(@GLuint int index, @GLenum int pname, @Result @GLvoid ByteBuffer result);
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java 2010-04-13 20:28:04 UTC (rev 3324)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java 2010-04-14 14:58:18 UTC (rev 3325)
@@ -195,13 +195,13 @@
int glGetAttribLocationARB(@GLhandleARB int programObj, @NullTerminated CharSequence name);
@StripPostfix("params")
- void glGetVertexAttribfvARB(@GLuint int index, @GLenum int pname, @OutParameter @Check FloatBuffer params);
+ void glGetVertexAttribfvARB(@GLuint int index, @GLenum int pname, @OutParameter @Check("4") FloatBuffer params);
@StripPostfix("params")
- void glGetVertexAttribdvARB(@GLuint int index, @GLenum int pname, @OutParameter @Check DoubleBuffer params);
+ void glGetVertexAttribdvARB(@GLuint int index, @GLenum int pname, @OutParameter @Check("4") DoubleBuffer params);
@StripPostfix("params")
- void glGetVertexAttribivARB(@GLuint int index, @GLenum int pname, @OutParameter @Check IntBuffer params);
+ void glGetVertexAttribivARB(@GLuint int index, @GLenum int pname, @OutParameter @Check("4") IntBuffer params);
@StripPostfix("result")
void glGetVertexAttribPointervARB(@GLuint int index, @GLenum int pname, @Result @GLvoid ByteBuffer result);
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_gpu_shader4.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_gpu_shader4.java 2010-04-13 20:28:04 UTC (rev 3324)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_gpu_shader4.java 2010-04-14 14:58:18 UTC (rev 3325)
@@ -168,7 +168,7 @@
@GLuint Buffer buffer);
@StripPostfix("params")
- void glGetVertexAttribIivEXT(@GLuint int index, @GLenum int pname, @OutParameter @Check("4")IntBuffer params);
+ void glGetVertexAttribIivEXT(@GLuint int index, @GLenum int pname, @OutParameter @Check("4") IntBuffer params);
@StripPostfix("params")
void glGetVertexAttribIuivEXT(@GLuint int index, @GLenum int pname, @OutParameter @Check("4") @GLuint IntBuffer params);
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_shader_image_load_store.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_shader_image_load_store.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_shader_image_load_store.java 2010-04-14 14:58:18 UTC (rev 3325)
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2002-2008 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opengl;
+
+import org.lwjgl.util.generator.GLbitfield;
+import org.lwjgl.util.generator.GLenum;
+import org.lwjgl.util.generator.GLuint;
+
+public interface EXT_shader_image_load_store {
+
+ /**
+ * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
+ * GetFloatv, and GetDoublev:
+ */
+ int GL_MAX_IMAGE_UNITS_EXT = 0x8F38;
+ int GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS_EXT = 0x8F39;
+ int GL_MAX_IMAGE_SAMPLES_EXT = 0x906D;
+
+ /** Accepted by the <target> parameter of GetIntegeri_v and GetBooleani_v: */
+ int GL_IMAGE_BINDING_NAME_EXT = 0x8F3A;
+ int GL_IMAGE_BINDING_LEVEL_EXT = 0x8F3B;
+ int GL_IMAGE_BINDING_LAYERED_EXT = 0x8F3C;
+ int GL_IMAGE_BINDING_LAYER_EXT = 0x8F3D;
+ int GL_IMAGE_BINDING_ACCESS_EXT = 0x8F3E;
+ int GL_IMAGE_BINDING_FORMAT_EXT = 0x906E;
+
+ /** Accepted by the <barriers> parameter of MemoryBarrierEXT: */
+ int GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT_EXT = 0x00000001;
+ int GL_ELEMENT_ARRAY_BARRIER_BIT_EXT = 0x00000002;
+ int GL_UNIFORM_BARRIER_BIT_EXT = 0x00000004;
+ int GL_TEXTURE_FETCH_BARRIER_BIT_EXT = 0x00000008;
+ int GL_SHADER_IMAGE_ACCESS_BARRIER_BIT_EXT = 0x00000020;
+ int GL_COMMAND_BARRIER_BIT_EXT = 0x00000040;
+ int GL_PIXEL_BUFFER_BARRIER_BIT_EXT = 0x00000080;
+ int GL_TEXTURE_UPDATE_BARRIER_BIT_EXT = 0x00000100;
+ int GL_BUFFER_UPDATE_BARRIER_BIT_EXT = 0x00000200;
+ int GL_FRAMEBUFFER_BARRIER_BIT_EXT = 0x00000400;
+ int GL_TRANSFORM_FEEDBACK_BARRIER_BIT_EXT = 0x00000800;
+ int GL_ATOMIC_COUNTER_BARRIER_BIT_EXT = 0x00001000;
+ int GL_ALL_BARRIER_BITS_EXT = 0xFFFFFFFF;
+
+ /** Returned by the <type> parameter of GetActiveUniform: */
+ int GL_IMAGE_1D_EXT = 0x904C;
+ int GL_IMAGE_2D_EXT = 0x904D;
+ int GL_IMAGE_3D_EXT = 0x904E;
+ int GL_IMAGE_2D_RECT_EXT = 0x904F;
+ int GL_IMAGE_CUBE_EXT = 0x9050;
+ int GL_IMAGE_BUFFER_EXT = 0x9051;
+ int GL_IMAGE_1D_ARRAY_EXT = 0x9052;
+ int GL_IMAGE_2D_ARRAY_EXT = 0x9053;
+ int GL_IMAGE_CUBE_MAP_ARRAY_EXT = 0x9054;
+ int GL_IMAGE_2D_MULTISAMPLE_EXT = 0x9055;
+ int GL_IMAGE_2D_MULTISAMPLE_ARRAY_EXT = 0x9056;
+ int GL_INT_IMAGE_1D_EXT = 0x9057;
+ int GL_INT_IMAGE_2D_EXT = 0x9058;
+ int GL_INT_IMAGE_3D_EXT = 0x9059;
+ int GL_INT_IMAGE_2D_RECT_EXT = 0x905A;
+ int GL_INT_IMAGE_CUBE_EXT = 0x905B;
+ int GL_INT_IMAGE_BUFFER_EXT = 0x905C;
+ int GL_INT_IMAGE_1D_ARRAY_EXT = 0x905D;
+ int GL_INT_IMAGE_2D_ARRAY_EXT = 0x905E;
+ int GL_INT_IMAGE_CUBE_MAP_ARRAY_EXT = 0x905F;
+ int GL_INT_IMAGE_2D_MULTISAMPLE_EXT = 0x9060;
+ int GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY_EXT = 0x9061;
+ int GL_UNSIGNED_INT_IMAGE_1D_EXT = 0x9062;
+ int GL_UNSIGNED_INT_IMAGE_2D_EXT = 0x9063;
+ int GL_UNSIGNED_INT_IMAGE_3D_EXT = 0x9064;
+ int GL_UNSIGNED_INT_IMAGE_2D_RECT_EXT = 0x9065;
+ int GL_UNSIGNED_INT_IMAGE_CUBE_EXT = 0x9066;
+ int GL_UNSIGNED_INT_IMAGE_BUFFER_EXT = 0x9067;
+ int GL_UNSIGNED_INT_IMAGE_1D_ARRAY_EXT = 0x9068;
+ int GL_UNSIGNED_INT_IMAGE_2D_ARRAY_EXT = 0x9069;
+ int GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY_EXT = 0x906A;
+ int GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_EXT = 0x906B;
+ int GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY_EXT = 0x906C;
+
+ void glBindImageTextureEXT(@GLuint int index, @GLuint int texture, int level, boolean layered, int layer, @GLenum int access, int format);
+
+ void glMemoryBarrierEXT(@GLbitfield int barriers);
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_vertex_attrib_64bit.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_vertex_attrib_64bit.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_vertex_attrib_64bit.java 2010-04-14 14:58:18 UTC (rev 3325)
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2002-2008 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opengl;
+
+import org.lwjgl.util.generator.*;
+
+import java.nio.Buffer;
+import java.nio.DoubleBuffer;
+
+@Dependent
+public interface EXT_vertex_attrib_64bit {
+
+ /** Returned in the <type> parameter of GetActiveAttrib: */
+ int GL_DOUBLE_VEC2_EXT = 0x8FFC;
+ int GL_DOUBLE_VEC3_EXT = 0x8FFD;
+ int GL_DOUBLE_VEC4_EXT = 0x8FFE;
+ int GL_DOUBLE_MAT2_EXT = 0x8F46;
+ int GL_DOUBLE_MAT3_EXT = 0x8F47;
+ int GL_DOUBLE_MAT4_EXT = 0x8F48;
+ int GL_DOUBLE_MAT2x3_EXT = 0x8F49;
+ int GL_DOUBLE_MAT2x4_EXT = 0x8F4A;
+ int GL_DOUBLE_MAT3x2_EXT = 0x8F4B;
+ int GL_DOUBLE_MAT3x4_EXT = 0x8F4C;
+ int GL_DOUBLE_MAT4x2_EXT = 0x8F4D;
+ int GL_DOUBLE_MAT4x3_EXT = 0x8F4E;
+
+ void glVertexAttribL1dEXT(@GLuint int index, double x);
+
+ void glVertexAttribL2dEXT(@GLuint int index, double x, double y);
+
+ void glVertexAttribL3dEXT(@GLuint int index, double x, double y, double z);
+
+ void glVertexAttribL4dEXT(@GLuint int index, double x, double y, double z, double w);
+
+ @StripPostfix("v")
+ void glVertexAttribL1dvEXT(@GLuint int index, @Const @Check("1") DoubleBuffer v);
+
+ @StripPostfix("v")
+ void glVertexAttribL2dvEXT(@GLuint int index, @Const @Check("2") DoubleBuffer v);
+
+ @StripPostfix("v")
+ void glVertexAttribL3dvEXT(@GLuint int index, @Const @Check("3") DoubleBuffer v);
+
+ @StripPostfix("v")
+ void glVertexAttribL4dvEXT(@GLuint int index, @Const @Check("4") DoubleBuffer v);
+
+ void glVertexAttribLPointerEXT(@GLuint int index, int size, @Constant("GL11.GL_DOUBLE") @GLenum int type, @GLsizei int stride,
+ @CachedReference(index = "index", name = "glVertexAttribPointer_buffer")
+ @BufferObject(BufferKind.ArrayVBO)
+ @Check @Const @GLdouble Buffer pointer);
+
+ @StripPostfix("params")
+ void glGetVertexAttribLdvEXT(@GLuint int index, @GLenum int pname, @OutParameter @Check("4") DoubleBuffer params);
+
+ @Dependent("EXT_direct_state_access")
+ void glVertexArrayVertexAttribLOffsetEXT(@GLuint int vaobj, @GLuint int buffer, @GLuint int index, int size, @GLenum int type, @GLsizei int stride, @GLintptr long offset);
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_gpu_program5.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_gpu_program5.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_gpu_program5.java 2010-04-14 14:58:18 UTC (rev 3325)
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2002-2008 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opengl;
+
+public interface NV_gpu_program5 {
+
+ /**
+ * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
+ * GetFloatv, and GetDoublev:
+ */
+ int GL_MAX_GEOMETRY_PROGRAM_INVOCATIONS_NV = 0x8E5A;
+ int GL_MIN_FRAGMENT_INTERPOLATION_OFFSET_NV = 0x8E5B;
+ int GL_MAX_FRAGMENT_INTERPOLATION_OFFSET_NV = 0x8E5C;
+ int GL_FRAGMENT_PROGRAM_INTERPOLATION_OFFSET_BITS_NV = 0x8E5D;
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_gpu_shader5.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_gpu_shader5.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_gpu_shader5.java 2010-04-14 14:58:18 UTC (rev 3325)
@@ -0,0 +1,182 @@
+/*
+ * Copyright (c) 2002-2008 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opengl;
+
+import org.lwjgl.util.generator.*;
+
+import java.nio.LongBuffer;
+
+@Dependent
+public interface NV_gpu_shader5 {
+
+ /**
+ * Returned by the <type> parameter of GetActiveAttrib, GetActiveUniform, and
+ * GetTransformFeedbackVarying:
+ */
+ int GL_INT64_NV = 0x140E;
+ int GL_UNSIGNED_INT64_NV = 0x140F;
+
+ int GL_INT8_NV = 0x8FE0;
+ int GL_INT8_VEC2_NV = 0x8FE1;
+ int GL_INT8_VEC3_NV = 0x8FE2;
+ int GL_INT8_VEC4_NV = 0x8FE3;
+ int GL_INT16_NV = 0x8FE4;
+ int GL_INT16_VEC2_NV = 0x8FE5;
+ int GL_INT16_VEC3_NV = 0x8FE6;
+ int GL_INT16_VEC4_NV = 0x8FE7;
+ int GL_INT64_VEC2_NV = 0x8FE9;
+ int GL_INT64_VEC3_NV = 0x8FEA;
+ int GL_INT64_VEC4_NV = 0x8FEB;
+ int GL_UNSIGNED_INT8_NV = 0x8FEC;
+ int GL_UNSIGNED_INT8_VEC2_NV = 0x8FED;
+ int GL_UNSIGNED_INT8_VEC3_NV = 0x8FEE;
+ int GL_UNSIGNED_INT8_VEC4_NV = 0x8FEF;
+ int GL_UNSIGNED_INT16_NV = 0x8FF0;
+ int GL_UNSIGNED_INT16_VEC2_NV = 0x8FF1;
+ int GL_UNSIGNED_INT16_VEC3_NV = 0x8FF2;
+ int GL_UNSIGNED_INT16_VEC4_NV = 0x8FF3;
+ int GL_UNSIGNED_INT64_VEC2_NV = 0x8FF5;
+ int GL_UNSIGNED_INT64_VEC3_NV = 0x8FF6;
+ int GL_UNSIGNED_INT64_VEC4_NV = 0x8FF7;
+ int GL_FLOAT16_NV = 0x8FF8;
+ int GL_FLOAT16_VEC2_NV = 0x8FF9;
+ int GL_FLOAT16_VEC3_NV = 0x8FFA;
+ int GL_FLOAT16_VEC4_NV = 0x8FFB;
+
+ /** Accepted by the <primitiveMode> parameter of BeginTransformFeedback: */
+ int GL_PATCHES = ARB_tessellation_shader.GL_PATCHES;
+
+ void glUniform1i64NV(int location, @GLint64EXT long x);
+
+ void glUniform2i64NV(int location, @GLint64EXT long x, @GLint64EXT long y);
+
+ void glUniform3i64NV(int location, @GLint64EXT long x, @GLint64EXT long y, @GLint64EXT long z);
+
+ void glUniform4i64NV(int location, @GLint64EXT long x, @GLint64EXT long y, @GLint64EXT long z, @GLint64EXT long w);
+
+ @StripPostfix("value")
+ void glUniform1i64vNV(int location, @GLsizei int count, @Const @GLint64EXT @Check("1") LongBuffer value);
+
+ @StripPostfix("value")
+ void glUniform2i64vNV(int location, @GLsizei int count, @Const @GLint64EXT @Check("2") LongBuffer value);
+
+ @StripPostfix("value")
+ void glUniform3i64vNV(int location, @GLsizei int count, @Const @GLint64EXT @Check("3") LongBuffer value);
+
+ @StripPostfix("value")
+ void glUniform4i64vNV(int location, @GLsizei int count, @Const @GLint64EXT @Check("4") LongBuffer value);
+
+ void glUniform1ui64NV(int location, @GLuint64EXT long x);
+
+ void glUniform2ui64NV(int location, @GLuint64EXT long x, @GLuint64EXT long y);
+
+ void glUniform3ui64NV(int location, @GLuint64EXT long x, @GLuint64EXT long y, @GLuint64EXT long z);
+
+ void glUniform4ui64NV(int location, @GLuint64EXT long x, @GLuint64EXT long y, @GLuint64EXT long z, @GLuint64EXT long w);
+
+ @StripPostfix("value")
+ void glUniform1ui64vNV(int location, @GLsizei int count, @Const @GLuint64EXT @Check("1") LongBuffer value);
+
+ @StripPostfix("value")
+ void glUniform2ui64vNV(int location, @GLsizei int count, @Const @GLuint64EXT @Check("2") LongBuffer value);
+
+ @StripPostfix("value")
+ void glUniform3ui64vNV(int location, @GLsizei int count, @Const @GLuint64EXT @Check("3") LongBuffer value);
+
+ @StripPostfix("value")
+ void glUniform4ui64vNV(int location, @GLsizei int count, @Const @GLuint64EXT @Check("4") LongBuffer value);
+
+ @StripPostfix("params")
+ void glGetUniformi64vNV(@GLuint int program, int location, @GLint64EXT @Check LongBuffer params);
+
+ @StripPostfix("params")
+ void glGetUniformui64vNV(@GLuint int program, int location, @GLuint64EXT @Check LongBuffer params);
+
+ // -------------
+
+ @Dependent("EXT_direct_state_access")
+ void glProgramUniform1i64NV(@GLuint int program, int location, @GLint64EXT long x);
+
+ @Dependent("EXT_direct_state_access")
+ void glProgramUniform2i64NV(@GLuint int program, int location, @GLint64EXT long x, @GLint64EXT long y);
+
+ @Dependent("EXT_direct_state_access")
+ void glProgramUniform3i64NV(@GLuint int program, int location, @GLint64EXT long x, @GLint64EXT long y, @GLint64EXT long z);
+
+ @Dependent("EXT_direct_state_access")
+ void glProgramUniform4i64NV(@GLuint int program, int location, @GLint64EXT long x, @GLint64EXT long y, @GLint64EXT long z, @GLint64EXT long w);
+
+ @Dependent("EXT_direct_state_access")
+ @StripPostfix("value")
+ void glProgramUniform1i64vNV(@GLuint int program, int location, @GLsizei int count, @Const @GLint64EXT @Check("1") LongBuffer value);
+
+ @Dependent("EXT_direct_state_access")
+ @StripPostfix("value")
+ void glProgramUniform2i64vNV(@GLuint int program, int location, @GLsizei int count, @Const @GLint64EXT @Check("2") LongBuffer value);
+
+ @Dependent("EXT_direct_state_access")
+ @StripPostfix("value")
+ void glProgramUniform3i64vNV(@GLuint int program, int location, @GLsizei int count, @Const @GLint64EXT @Check("3") LongBuffer value);
+
+ @Dependent("EXT_direct_state_access")
+ @StripPostfix("value")
+ void glProgramUniform4i64vNV(@GLuint int program, int location, @GLsizei int count, @Const @GLint64EXT @Check("4") LongBuffer value);
+
+ @Dependent("EXT_direct_state_access")
+ void glProgramUniform1ui64NV(@GLuint int program, int location, @GLuint64EXT long x);
+
+ @Dependent("EXT_direct_state_access")
+ void glProgramUniform2ui64NV(@GLuint int program, int location, @GLuint64EXT long x, @GLuint64EXT long y);
+
+ @Dependent("EXT_direct_state_access")
+ void glProgramUniform3ui64NV(@GLuint int program, int location, @GLuint64EXT long x, @GLuint64EXT long y, @GLuint64EXT long z);
+
+ @Dependent("EXT_direct_state_access")
+ void glProgramUniform4ui64NV(@GLuint int program, int location, @GLuint64EXT long x, @GLuint64EXT long y, @GLuint64EXT long z, @GLuint64EXT long w);
+
+ @Dependent("EXT_direct_state_access")
+ @StripPostfix("value")
+ void glProgramUniform1ui64vNV(@GLuint int program, int location, @GLsizei int count, @Const @GLuint64EXT @Check("1") LongBuffer value);
+
+ @Dependent("EXT_direct_state_access")
+ @StripPostfix("value")
+ void glProgramUniform2ui64vNV(@GLuint int program, int location, @GLsizei int count, @Const @GLuint64EXT @Check("2") LongBuffer value);
+
+ @Dependent("EXT_direct_state_access")
+ @StripPostfix("value")
+ void glProgramUniform3ui64vNV(@GLuint int program, int location, @GLsizei int count, @Const @GLuint64EXT @Check("3") LongBuffer value);
+
+ @Dependent("EXT_direct_state_access")
+ @StripPostfix("value")
+ void glProgramUniform4ui64vNV(@GLuint int program, int location, @GLsizei int count, @Const @GLuint64EXT @Check("4") LongBuffer value);
+
+}
\ No newline at end of file
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_shader_buffer_load.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_shader_buffer_load.java 2010-04-13 20:28:04 UTC (rev 3324)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_shader_buffer_load.java 2010-04-14 14:58:18 UTC (rev 3325)
@@ -55,10 +55,10 @@
boolean glIsBufferResidentNV(@GLenum int target);
- // TODO: These two are currently missing from the latest NV drivers, check again sometime.
- //void glNamedMakeBufferResidentNV(@GLuint int buffer, @GLenum int access);
- //void glNamedMakeBufferNonResidentNV(@GLuint int buffer);
+ void glMakeNamedBufferResidentNV(@GLuint int buffer, @GLenum int access);
+ void glMakeNamedBufferNonResidentNV(@GLuint int buffer);
+
boolean glIsNamedBufferResidentNV(@GLuint int buffer);
@StripPostfix("params")
@@ -88,7 +88,7 @@
void glUniformui64NV(int location, @GLuint64EXT long value);
@StripPostfix("value")
- void glUniformui64vNV(int location, @AutoSize("value") @GLsizei int count, @GLuint64EXT LongBuffer value);
+ void glUniformui64vNV(int location, @AutoSize("value") @GLsizei int count, @Const @GLuint64EXT LongBuffer value);
@StripPostfix("params")
void glGetUniformui64vNV(@GLuint int program, int location, @OutParameter @Check("1") @GLuint64EXT LongBuffer params);
@@ -96,6 +96,6 @@
void glProgramUniformui64NV(@GLuint int program, int location, @GLuint64EXT long value);
@StripPostfix("value")
- void glProgramUniformui64vNV(@GLuint int program, int location, @AutoSize("value") @GLsizei int count, @GLuint64EXT LongBuffer value);
+ void glProgramUniformui64vNV(@GLuint int program, int location, @AutoSize("value") @GLsizei int count, @Const @GLuint64EXT LongBuffer value);
}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_shader_buffer_store.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_shader_buffer_store.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_shader_buffer_store.java 2010-04-14 14:58:18 UTC (rev 3325)
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2002-2008 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ...
[truncated message content] |
|
From: <sp...@us...> - 2012-03-27 13:12:36
|
Revision: 3758
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3758&view=rev
Author: spasi
Date: 2012-03-27 13:12:30 +0000 (Tue, 27 Mar 2012)
Log Message:
-----------
Added support for: AMD_vertex_shader_viewport_index, AMD_vertex_shader_layer, NV_bindless_texture, NV_shader_atomic_float.
Added Paths:
-----------
trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_vertex_shader_layer.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_vertex_shader_viewport_index.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_bindless_texture.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_shader_atomic_float.java
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_vertex_shader_layer.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_vertex_shader_layer.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_vertex_shader_layer.java 2012-03-27 13:12:30 UTC (rev 3758)
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2002-2012 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opengl;
+
+public interface AMD_vertex_shader_layer {
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_vertex_shader_viewport_index.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_vertex_shader_viewport_index.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_vertex_shader_viewport_index.java 2012-03-27 13:12:30 UTC (rev 3758)
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2002-2012 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opengl;
+
+public interface AMD_vertex_shader_viewport_index {
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_bindless_texture.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_bindless_texture.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_bindless_texture.java 2012-03-27 13:12:30 UTC (rev 3758)
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2002-2012 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opengl;
+
+import org.lwjgl.util.generator.AutoSize;
+import org.lwjgl.util.generator.Const;
+import org.lwjgl.util.generator.StripPostfix;
+import org.lwjgl.util.generator.opengl.GLenum;
+import org.lwjgl.util.generator.opengl.GLsizei;
+import org.lwjgl.util.generator.opengl.GLuint;
+import org.lwjgl.util.generator.opengl.GLuint64;
+
+import java.nio.LongBuffer;
+
+public interface NV_bindless_texture {
+
+ @GLuint64
+ long glGetTextureHandleNV(@GLuint int texture);
+
+ @GLuint64
+ long glGetTextureSamplerHandleNV(@GLuint int texture, @GLuint int sampler);
+
+ void glMakeTextureHandleResidentNV(@GLuint64 long handle);
+
+ void glMakeTextureHandleNonResidentNV(@GLuint64 long handle);
+
+ @GLuint64
+ long glGetImageHandleNV(@GLuint int texture, int level, boolean layered,
+ int layer, @GLenum int format);
+
+ void glMakeImageHandleResidentNV(@GLuint64 long handle, @GLenum int access);
+
+ void glMakeImageHandleNonResidentNV(@GLuint64 long handle);
+
+ void glUniformHandleui64NV(int location, @GLuint64 long value);
+
+ @StripPostfix("value")
+ void glUniformHandleui64vNV(int location, @AutoSize("value") @GLsizei int count, @Const @GLuint64 LongBuffer value);
+
+ void glProgramUniformHandleui64NV(@GLuint int program, int location,
+ @GLuint64 long value);
+
+ @StripPostfix("values")
+ void glProgramUniformHandleui64vNV(@GLuint int program, int location,
+ @AutoSize("values") @GLsizei int count, @Const @GLuint64 LongBuffer values);
+
+ boolean glIsTextureHandleResidentNV(@GLuint64 long handle);
+
+ boolean glIsImageHandleResidentNV(@GLuint64 long handle);
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_shader_atomic_float.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_shader_atomic_float.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_shader_atomic_float.java 2012-03-27 13:12:30 UTC (rev 3758)
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2002-2012 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opengl;
+
+public interface NV_shader_atomic_float {
+
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2012-05-04 17:23:43
|
Revision: 3768
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3768&view=rev
Author: spasi
Date: 2012-05-04 17:23:36 +0000 (Fri, 04 May 2012)
Log Message:
-----------
GL spec 20120427 updates.
Modified Paths:
--------------
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL11.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL13.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL14.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL40.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL41.java
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL11.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL11.java 2012-04-26 18:08:12 UTC (rev 3767)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL11.java 2012-05-04 17:23:36 UTC (rev 3768)
@@ -719,9 +719,9 @@
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 @@
@GLuint IntBuffer textures,
@Const
@Check("textures.remaining()")
- @GLclampf FloatBuffer priorities);
+ FloatBuffer priorities);
@DeprecatedGL
boolean glAreTexturesResident(@AutoSize("textures") @GLsizei int n,
@@ -776,7 +776,7 @@
@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 @@
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);
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL13.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL13.java 2012-04-26 18:08:12 UTC (rev 3767)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL13.java 2012-05-04 17:23:36 UTC (rev 3768)
@@ -253,6 +253,6 @@
@DeprecatedGL
void glMultTransposeMatrixd(@Check("16") @Const DoubleBuffer m);
- void glSampleCoverage(@GLclampf float value, boolean invert);
+ void glSampleCoverage(float value, boolean invert);
}
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL14.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL14.java 2012-04-26 18:08:12 UTC (rev 3767)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL14.java 2012-05-04 17:23:36 UTC (rev 3768)
@@ -97,7 +97,7 @@
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);
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java 2012-04-26 18:08:12 UTC (rev 3767)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java 2012-05-04 17:23:36 UTC (rev 3768)
@@ -76,9 +76,12 @@
// ----------------------[ 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);
// --------------------------------------------------------------------
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL40.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL40.java 2012-04-26 18:08:12 UTC (rev 3767)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL40.java 2012-05-04 17:23:36 UTC (rev 3768)
@@ -184,7 +184,7 @@
*/
int GL_MIN_SAMPLE_SHADING_VALUE = 0x8C37;
- void glMinSampleShading(@GLclampf float value);
+ void glMinSampleShading(float value);
// ---------------------------------------------------------------------
// ----------------------[ ARB_shader_subroutine ]----------------------
@@ -394,8 +394,10 @@
* 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);
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL41.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL41.java 2012-04-26 18:08:12 UTC (rev 3767)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL41.java 2012-05-04 17:23:36 UTC (rev 3768)
@@ -77,9 +77,9 @@
@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 @@
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);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2012-06-19 10:44:11
|
Revision: 3780
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3780&view=rev
Author: spasi
Date: 2012-06-19 10:44:02 +0000 (Tue, 19 Jun 2012)
Log Message:
-----------
Removed unnecessary GL_RED from GL30.
Added AMD_query_buffer_object.
Modified Paths:
--------------
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java
Added Paths:
-----------
trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_query_buffer_object.java
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_query_buffer_object.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_query_buffer_object.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_query_buffer_object.java 2012-06-19 10:44:02 UTC (rev 3780)
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2002-2010 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opengl;
+
+public interface AMD_query_buffer_object {
+
+ /**
+ * Accepted by the <pname> parameter of GetQueryObjectiv, GetQueryObjectuiv,
+ * GetQueryObjecti64v and GetQueryObjectui64v:
+ */
+ int GL_QUERY_RESULT_NO_WAIT_AMD = 0x9194;
+
+ /**
+ * Accepted by the <target> parameters of BindBuffer, BufferData,
+ * BufferSubData, MapBuffer, UnmapBuffer, MapBufferRange, GetBufferSubData,
+ * GetBufferParameteriv
+ * and GetBufferPointerv:
+ */
+ int GL_QUERY_BUFFER_AMD = 0x9192;
+
+ /**
+ * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv,
+ * and GetDoublev:
+ */
+ int GL_QUERY_BUFFER_BINDING_AMD = 0x9193;
+
+}
\ No newline at end of file
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java 2012-06-17 20:54:07 UTC (rev 3779)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java 2012-06-19 10:44:02 UTC (rev 3780)
@@ -907,12 +907,6 @@
int GL_RG = 0x8227;
int GL_RG_INTEGER = 0x8228;
- /**
- * Accepted by the <param> parameter of the TexParameter{if}*
- * functions when <pname> is DEPTH_TEXTURE_MODE:
- */
- int GL_RED = 0x1903;
-
// ----------------------------------------------------------------------
// ----------------------[ EXT_transform_feedback ]----------------------
// ----------------------------------------------------------------------
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2012-08-14 12:54:01
|
Revision: 3784
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3784&view=rev
Author: spasi
Date: 2012-08-14 12:53:54 +0000 (Tue, 14 Aug 2012)
Log Message:
-----------
Removed ARB_debug_group, ARB_debug_label and ARB_debug_output2. They're part of KHR_debug and weren't supposed to be posted in the GL registry.
Removed Paths:
-------------
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_debug_group.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_debug_label.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_debug_output2.java
Deleted: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_debug_group.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_debug_group.java 2012-08-07 15:14:03 UTC (rev 3783)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_debug_group.java 2012-08-14 12:53:54 UTC (rev 3784)
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 2002-2012 LWJGL Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * * Neither the name of 'LWJGL' nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.lwjgl.opengl;
-
-import org.lwjgl.util.generator.*;
-import org.lwjgl.util.generator.opengl.GLchar;
-import org.lwjgl.util.generator.opengl.GLenum;
-import org.lwjgl.util.generator.opengl.GLsizei;
-import org.lwjgl.util.generator.opengl.GLuint;
-
-import java.nio.ByteBuffer;
-
-public interface ARB_debug_group {
-
- /**
- * Tokens accepted or provided by the <type> parameters of
- * DebugMessageControl, DebugMessageInsertand DEBUGPROC,
- * and the <types> parameter of GetDebugMessageLog:
- */
- int GL_DEBUG_TYPE_MARKER = 0x8268;
-
- /**
- * Tokens accepted or provided by the <type> parameters of
- * DebugMessageControl and DEBUGPROC, and the <types> parameter of
- * GetDebugMessageLog:
- */
- int GL_DEBUG_TYPE_PUSH_GROUP = 0x8269,
- GL_DEBUG_TYPE_POP_GROUP = 0x826A;
-
- /**
- * Tokens accepted or provided by the <severity> parameters of
- * DebugMessageControl, DebugMessageInsert and DEBUGPROC
- * callback functions, and the <severities> parameter of
- * GetDebugMessageLog:
- */
- int GL_DEBUG_SEVERITY_NOTIFICATION = 0x826B;
-
- /**
- * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
- * GetFloatv, GetDoublev, and GetInteger64v:
- */
- int GL_MAX_DEBUG_GROUP_STACK_DEPTH = 0x826C,
- GL_DEBUG_GROUP_STACK_DEPTH = 0x826D;
-
- /** Returned by GetError: */
- int GL_STACK_UNDERFLOW = 0x0504,
- GL_STACK_OVERFLOW = 0x0503;
-
- @Reuse("GL43")
- void glPushDebugGroup(@GLenum int source, @GLuint int id, @AutoSize("message") @GLsizei int length,
- @Const @GLchar ByteBuffer message);
-
- @Reuse("GL43")
- @Alternate("glPushDebugGroup")
- void glPushDebugGroup(@GLenum int source, @GLuint int id, @Constant("message.length()") @GLsizei int length,
- CharSequence message);
-
- @Reuse("GL43")
- void glPopDebugGroup();
-
-}
\ No newline at end of file
Deleted: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_debug_label.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_debug_label.java 2012-08-07 15:14:03 UTC (rev 3783)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_debug_label.java 2012-08-14 12:53:54 UTC (rev 3784)
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) 2002-2012 LWJGL Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * * Neither the name of 'LWJGL' nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.lwjgl.opengl;
-
-import org.lwjgl.util.generator.*;
-import org.lwjgl.util.generator.opengl.*;
-
-import java.nio.ByteBuffer;
-import java.nio.IntBuffer;
-
-public interface ARB_debug_label {
-
- /**
- * Tokens accepted or provided by the <identifier> parameters of
- * ObjectLabel and GetObjectLabel:
- */
- int GL_BUFFER = 0x82E0,
- GL_SHADER = 0x82E1,
- GL_PROGRAM = 0x82E2,
- GL_QUERY = 0x82E3,
- GL_PROGRAM_PIPELINE = 0x82E4,
- GL_SAMPLER = 0x82E6,
- GL_DISPLAY_LIST = 0x82E7;
-
- /**
- * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
- * GetFloatv, GetDoublev, and GetInteger64v:
- */
- int GL_MAX_LABEL_LENGTH = 0x82E8;
-
- @Reuse("GL43")
- void glObjectLabel(@GLenum int identifier, @GLuint int name, @AutoSize(value = "label", canBeNull = true) @GLsizei int length,
- @Check(canBeNull = true) @Const @GLchar ByteBuffer label);
-
- @Reuse("GL43")
- @Alternate("glObjectLabel")
- void glObjectLabel(@GLenum int identifier, @GLuint int name, @Constant("label.length()") @GLsizei int length,
- CharSequence label);
-
- @Reuse("GL43")
- void glGetObjectLabel(@GLenum int identifier, @GLuint int name, @AutoSize("label") @GLsizei int bufSize,
- @OutParameter @Check(value = "1", canBeNull = true) @GLsizei IntBuffer length,
- @OutParameter @GLchar ByteBuffer label);
-
- @Reuse("GL43")
- @Alternate("glGetObjectLabel")
- @GLreturn(value = "label", maxLength = "bufSize")
- void glGetObjectLabel2(@GLenum int identifier, @GLuint int name, @GLsizei int bufSize,
- @OutParameter @GLsizei @Constant("MemoryUtil.getAddress0(label_length)") IntBuffer length,
- @OutParameter @GLchar ByteBuffer label);
-
- @Reuse("GL43")
- void glObjectPtrLabel(@PointerWrapper("GLvoid *") org.lwjgl.PointerWrapper ptr, @AutoSize(value = "label", canBeNull = true) @GLsizei int length,
- @Check(canBeNull = true) @Const @GLchar ByteBuffer label);
-
- @Reuse("GL43")
- @Alternate("glObjectPtrLabel")
- void glObjectPtrLabel(@PointerWrapper("GLvoid *") org.lwjgl.PointerWrapper ptr, @Constant("label.length()") @GLsizei int length,
- CharSequence label);
-
- @Reuse("GL43")
- void glGetObjectPtrLabel(@PointerWrapper("GLvoid *") org.lwjgl.PointerWrapper ptr, @AutoSize("label") @GLsizei int bufSize,
- @OutParameter @Check(value = "1", canBeNull = true) @GLsizei IntBuffer length,
- @OutParameter @GLchar ByteBuffer label);
-
- @Reuse("GL43")
- @Alternate("glGetObjectPtrLabel")
- @GLreturn(value = "label", maxLength = "bufSize")
- void glGetObjectPtrLabel2(@PointerWrapper("GLvoid *") org.lwjgl.PointerWrapper ptr, @GLsizei int bufSize,
- @OutParameter @GLsizei @Constant("MemoryUtil.getAddress0(label_length)") IntBuffer length,
- @OutParameter @GLchar ByteBuffer label);
-
-}
\ No newline at end of file
Deleted: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_debug_output2.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_debug_output2.java 2012-08-07 15:14:03 UTC (rev 3783)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_debug_output2.java 2012-08-14 12:53:54 UTC (rev 3784)
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2002-2012 LWJGL Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * * Neither the name of 'LWJGL' nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.lwjgl.opengl;
-
-public interface ARB_debug_output2 {
-
- /** Returned by GetIntegerv when <pname> is CONTEXT_FLAGS: */
- int GL_CONTEXT_FLAG_DEBUG_BIT = 0x00000002;
-
- /**
- * Tokens accepted by the <target> parameters of Enable, Disable,
- * and IsEnabled:
- */
- int GL_DEBUG_OUTPUT = 0x92E0;
-
-}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2012-11-06 16:18:37
|
Revision: 3819
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3819&view=rev
Author: spasi
Date: 2012-11-06 16:18:28 +0000 (Tue, 06 Nov 2012)
Log Message:
-----------
Added missing alternative signature functions.
Modified Paths:
--------------
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_subroutine.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL40.java
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_subroutine.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_subroutine.java 2012-11-06 12:14:03 UTC (rev 3818)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_subroutine.java 2012-11-06 16:18:28 UTC (rev 3819)
@@ -64,11 +64,19 @@
@Reuse("GL40")
int glGetSubroutineUniformLocation(@GLuint int program, @GLenum int shadertype, @Const @NullTerminated ByteBuffer name);
+ @Alternate("glGetSubroutineUniformLocation")
@Reuse("GL40")
+ int glGetSubroutineUniformLocation(@GLuint int program, @GLenum int shadertype, @NullTerminated CharSequence name);
+
+ @Reuse("GL40")
@GLuint
int glGetSubroutineIndex(@GLuint int program, @GLenum int shadertype, @Const @NullTerminated ByteBuffer name);
+ @Alternate("glGetSubroutineIndex")
@Reuse("GL40")
+ int glGetSubroutineIndex(@GLuint int program, @GLenum int shadertype, @NullTerminated CharSequence name);
+
+ @Reuse("GL40")
@StripPostfix("values")
void glGetActiveSubroutineUniformiv(@GLuint int program, @GLenum int shadertype, @GLuint int index, @GLenum int pname,
@Check("1") @OutParameter IntBuffer values);
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL40.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL40.java 2012-11-06 12:14:03 UTC (rev 3818)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL40.java 2012-11-06 16:18:28 UTC (rev 3819)
@@ -218,9 +218,16 @@
int glGetSubroutineUniformLocation(@GLuint int program, @GLenum int shadertype, @Const @NullTerminated ByteBuffer name);
+ @Alternate("glGetSubroutineUniformLocation")
+ int glGetSubroutineUniformLocation(@GLuint int program, @GLenum int shadertype, @NullTerminated CharSequence name);
+
@GLuint
int glGetSubroutineIndex(@GLuint int program, @GLenum int shadertype, @Const @NullTerminated ByteBuffer name);
+ @Alternate("glGetSubroutineIndex")
+ @GLuint
+ int glGetSubroutineIndex(@GLuint int program, @GLenum int shadertype, @NullTerminated CharSequence name);
+
@StripPostfix("values")
void glGetActiveSubroutineUniformiv(@GLuint int program, @GLenum int shadertype, @GLuint int index, @GLenum int pname,
@OutParameter @Check("1") IntBuffer values);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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.
|