java-game-lib-cvs Mailing List for Lightweight Java Game Library

Revision: 3837
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3837&view=rev
Author:   spasi
Date:     2012-12-19 12:38:50 +0000 (Wed, 19 Dec 2012)
Log Message:
-----------
Fixed commit error.

Modified Paths:
--------------
    trunk/LWJGL/src/native/windows/opengl/context.c

Modified: trunk/LWJGL/src/native/windows/opengl/context.c
===================================================================
--- trunk/LWJGL/src/native/windows/opengl/context.c	2012-12-18 11:22:52 UTC (rev 3836)
+++ trunk/LWJGL/src/native/windows/opengl/context.c	2012-12-19 12:38:50 UTC (rev 3837)
@@ -224,7 +224,6 @@
 		putAttrib(&attrib_list, WGL_ACCELERATION_ARB); putAttrib(&attrib_list, WGL_FULL_ACCELERATION_ARB);
 	}
 	putAttrib(&attrib_list, WGL_PIXEL_TYPE_ARB); putAttrib(&attrib_list, pixel_type);
-	putAttrib(&attrib_list, WGL_DOUBLE_BUFFER_ARB); putAttrib(&attrib_list, double_buffer ? TRUE : FALSE);
 	if ( double_buffer || samples == 0 ) {
 		// Skip this for FALSE + MSAA: NV drivers won't return any PixelFormat
 		putAttrib(&attrib_list, WGL_DOUBLE_BUFFER_ARB); putAttrib(&attrib_list, double_buffer ? TRUE : FALSE);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3836
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3836&view=rev
Author:   spasi
Date:     2012-12-18 11:22:52 +0000 (Tue, 18 Dec 2012)
Log Message:
-----------
Fixed BackgroundLoadTest to work on NV/Intel and improved context synchronization.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/test/opengl/multithread/BackgroundLoader.java

Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/multithread/BackgroundLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/multithread/BackgroundLoader.java	2012-12-17 11:58:48 UTC (rev 3835)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/multithread/BackgroundLoader.java	2012-12-18 11:22:52 UTC (rev 3836)
@@ -40,26 +40,33 @@
 import org.lwjgl.BufferUtils;
 import org.lwjgl.LWJGLException;
 import org.lwjgl.opengl.Drawable;
+import org.lwjgl.opengl.GLContext;
+import org.lwjgl.opengl.GLSync;
 import org.lwjgl.util.Color;
 import org.lwjgl.util.ReadableColor;
 
 import java.nio.ByteBuffer;
+import java.util.concurrent.locks.ReentrantLock;
 
 import static org.lwjgl.opengl.GL11.*;
+import static org.lwjgl.opengl.GL32.*;
 
 abstract class BackgroundLoader {
 
-	private static final int WIDTH = 32;
+	private static final int WIDTH  = 32;
 	private static final int HEIGHT = 32;
 
-	private static final Object lock = new Object();
+	// CPU synchronization
+	private final ReentrantLock lock = new ReentrantLock();
+	// GPU synchronization
+	private GLSync fence;
 
 	private Drawable drawable;
 
 	private boolean running;
 
 	private ByteBuffer texture;
-	private int texID;
+	private int        texID;
 
 	protected BackgroundLoader() {
 		running = true;
@@ -73,6 +80,9 @@
 	}
 
 	void start() throws LWJGLException {
+		// The shared context must be created on the main thread.
+		drawable = getDrawable();
+
 		new Thread(new Runnable() {
 			public void run() {
 				System.out.println("-- Background Thread started --");
@@ -86,7 +96,7 @@
 				}
 
 				try {
-					drawable = getDrawable();
+					// Make the shared context current in the worker thread
 					drawable.makeCurrent();
 				} catch (LWJGLException e) {
 					throw new RuntimeException(e);
@@ -94,20 +104,30 @@
 
 				System.out.println("** Drawable created **");
 
-				synchronized ( lock ) {
-					// Create a "dummy" texture while we wait for texture IO
-					createCheckerTexture(Color.RED, Color.WHITE, 2);
+				// Create a "dummy" texture while we wait for texture IO
+				createCheckerTexture(Color.RED, Color.WHITE, 2);
 
-					texID = glGenTextures();
-					glBindTexture(GL_TEXTURE_2D, texID);
-					glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, WIDTH, HEIGHT, 0, GL_RGB, GL_UNSIGNED_BYTE, texture);
+				lock.lock();
 
-					glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-					glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+				texID = glGenTextures();
+				glBindTexture(GL_TEXTURE_2D, texID);
+				glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, WIDTH, HEIGHT, 0, GL_RGB, GL_UNSIGNED_BYTE, texture);
 
-					glBindTexture(GL_TEXTURE_2D, 0);
-				}
+				glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+				glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 
+				glBindTexture(GL_TEXTURE_2D, 0);
+
+				// OpenGL commands from different contexts may be executed in any order. So we need a way to synchronize
+				final boolean useFences = GLContext.getCapabilities().OpenGL32;
+
+				if ( useFences )
+					fence = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
+				else
+					glFlush(); // Best we can do without fences. This will force rendering on the main thread to happen after we upload the texture.
+
+				lock.unlock();
+
 				System.out.println("** Dummy texture created **");
 
 				long lastTextureCreated = System.currentTimeMillis(); // Delay first texture creation
@@ -129,14 +149,23 @@
 					else
 						createGradientTexture(Color.GREEN, Color.YELLOW);
 
+					lock.lock();
+
 					glBindTexture(GL_TEXTURE_2D, texID);
 					glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, WIDTH, HEIGHT, 0, GL_RGB, GL_UNSIGNED_BYTE, texture);
 
-					glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-					glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+					glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+					glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 
 					glBindTexture(GL_TEXTURE_2D, 0);
 
+					if ( useFences )
+						fence = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
+					else
+						glFlush();
+
+					lock.unlock();
+
 					System.out.println("** Created new gradient texture **");
 
 					lastTextureCreated = System.currentTimeMillis();
@@ -151,8 +180,15 @@
 	}
 
 	int getTexID() {
-		synchronized ( lock ) {
+		lock.lock();
+		try {
+			if ( fence != null ) {
+				glWaitSync(fence, 0, GL_TIMEOUT_IGNORED);
+				fence = null;
+			}
 			return texID;
+		} finally {
+			lock.unlock();
 		}
 	}
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3835
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3835&view=rev
Author:   spasi
Date:     2012-12-17 11:58:48 +0000 (Mon, 17 Dec 2012)
Log Message:
-----------
Fixed pbuffer + MSAA pixel format config on NV drivers.

Modified Paths:
--------------
    trunk/LWJGL/src/native/windows/opengl/context.c

Modified: trunk/LWJGL/src/native/windows/opengl/context.c
===================================================================
--- trunk/LWJGL/src/native/windows/opengl/context.c	2012-12-12 17:20:24 UTC (rev 3834)
+++ trunk/LWJGL/src/native/windows/opengl/context.c	2012-12-17 11:58:48 UTC (rev 3835)
@@ -225,6 +225,10 @@
 	}
 	putAttrib(&attrib_list, WGL_PIXEL_TYPE_ARB); putAttrib(&attrib_list, pixel_type);
 	putAttrib(&attrib_list, WGL_DOUBLE_BUFFER_ARB); putAttrib(&attrib_list, double_buffer ? TRUE : FALSE);
+	if ( double_buffer || samples == 0 ) {
+		// Skip this for FALSE + MSAA: NV drivers won't return any PixelFormat
+		putAttrib(&attrib_list, WGL_DOUBLE_BUFFER_ARB); putAttrib(&attrib_list, double_buffer ? TRUE : FALSE);
+	}
 	putAttrib(&attrib_list, WGL_SUPPORT_OPENGL_ARB); putAttrib(&attrib_list, TRUE);
 	putAttrib(&attrib_list, WGL_RED_BITS_ARB); putAttrib(&attrib_list, bpe);
 	putAttrib(&attrib_list, WGL_GREEN_BITS_ARB); putAttrib(&attrib_list, bpe);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3834
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3834&view=rev
Author:   spasi
Date:     2012-12-12 17:20:24 +0000 (Wed, 12 Dec 2012)
Log Message:
-----------
Fixed put on external ByteBuffer. Generate @Deprecated annotation for deprecated methods.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/PointerBuffer.java
    trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java

Modified: trunk/LWJGL/src/java/org/lwjgl/PointerBuffer.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/PointerBuffer.java	2012-12-02 16:53:25 UTC (rev 3833)
+++ trunk/LWJGL/src/java/org/lwjgl/PointerBuffer.java	2012-12-12 17:20:24 UTC (rev 3834)
@@ -550,9 +550,9 @@
 	 */
 	public static void put(final ByteBuffer target, int index, long l) {
 		if ( is64Bit )
-			target.putLong(index * 8, l);
+			target.putLong(index, l);
 		else
-			target.putInt(index * 4, (int)l);
+			target.putInt(index, (int)l);
 	}
 
 	// -- Bulk get operations --

Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java	2012-12-02 16:53:25 UTC (rev 3833)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java	2012-12-12 17:20:24 UTC (rev 3834)
@@ -234,6 +234,8 @@
 
 	private static void printMethodWithMultiType(AnnotationProcessorEnvironment env, TypeMap type_map, PrintWriter writer, InterfaceDeclaration interface_decl, MethodDeclaration method, Map<ParameterDeclaration, TypeInfo> typeinfos_instance, Mode mode, boolean generate_error_checks, boolean context_specific) {
 		Utils.printDocComment(writer, method);
+		if ( method.getAnnotation(Deprecated.class) != null )
+			writer.println("\t@Deprecated");
 		if ( interface_decl.getAnnotation(Private.class) == null && method.getAnnotation(Private.class) == null )
 			writer.print("\tpublic static ");
 		else

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3833
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3833&view=rev
Author:   spasi
Date:     2012-12-02 16:53:25 +0000 (Sun, 02 Dec 2012)
Log Message:
-----------
OpenCL 1.2 update.

Added Paths:
-----------
    trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_depth_images.java
    trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_gl_depth_images.java
    trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_gl_msaa_sharing.java
    trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_image2d_from_buffer.java
    trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_initialize_memory.java
    trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_spir.java
    trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_terminate_context.java

Added: trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_depth_images.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_depth_images.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_depth_images.java	2012-12-02 16:53:25 UTC (rev 3833)
@@ -0,0 +1,42 @@
+/*
+ * 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.opencl;
+
+import org.lwjgl.util.generator.opencl.CLDeviceExtension;
+
+@CLDeviceExtension
+public interface KHR_depth_images {
+
+	/** cl_channel_order */
+	int CL_DEPTH = 0x10BD;
+
+}
\ No newline at end of file

Added: trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_gl_depth_images.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_gl_depth_images.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_gl_depth_images.java	2012-12-02 16:53:25 UTC (rev 3833)
@@ -0,0 +1,47 @@
+/*
+ * 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.opencl;
+
+import org.lwjgl.util.generator.Extension;
+import org.lwjgl.util.generator.opencl.CLDeviceExtension;
+
+@CLDeviceExtension
+@Extension(postfix = "KHR", className = "KHRGLDepthImages")
+public interface KHR_gl_depth_images {
+
+	/** cl_channel_order */
+	int CL_DEPTH_STENCIL = 0x10BE;
+
+	/** cl_channel_type */
+	int CL_UNORM_INT24 = 0x10DF;
+
+}
\ No newline at end of file

Added: trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_gl_msaa_sharing.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_gl_msaa_sharing.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_gl_msaa_sharing.java	2012-12-02 16:53:25 UTC (rev 3833)
@@ -0,0 +1,44 @@
+/*
+ * 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.opencl;
+
+import org.lwjgl.util.generator.Extension;
+import org.lwjgl.util.generator.opencl.CLDeviceExtension;
+
+@CLDeviceExtension
+@Extension(postfix = "KHR", className = "KHRGLMsaaSharing")
+public interface KHR_gl_msaa_sharing {
+
+	/** cl_gl_texture_info */
+	int CL_GL_NUM_SAMPLES = 0x2006;
+
+}
\ No newline at end of file

Added: trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_image2d_from_buffer.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_image2d_from_buffer.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_image2d_from_buffer.java	2012-12-02 16:53:25 UTC (rev 3833)
@@ -0,0 +1,45 @@
+/*
+ * 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.opencl;
+
+import org.lwjgl.util.generator.Extension;
+import org.lwjgl.util.generator.opencl.CLDeviceExtension;
+
+@CLDeviceExtension
+@Extension(postfix = "KHR", className = "KHRImage2DFromBuffer")
+public interface KHR_image2d_from_buffer {
+
+	/** cl_device_info */
+	int CL_DEVICE_IMAGE_PITCH_ALIGNMENT        = 0x104A,
+		CL_DEVICE_IMAGE_BASE_ADDRESS_ALIGNMENT = 0x104B;
+
+}
\ No newline at end of file

Added: trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_initialize_memory.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_initialize_memory.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_initialize_memory.java	2012-12-02 16:53:25 UTC (rev 3833)
@@ -0,0 +1,46 @@
+/*
+ * 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.opencl;
+
+import org.lwjgl.util.generator.opencl.CLDeviceExtension;
+
+@CLDeviceExtension
+public interface KHR_initialize_memory {
+
+	/** cl_context_properties */
+	int CL_CONTEXT_MEMORY_INITIALIZE_KHR = 0x200E;
+
+	/** */
+	int CL_CONTEXT_MEMORY_INITIALIZE_LOCAL_KHR    = 0x1, // TODO: Find value
+		CL_CONTEXT_MEMORY_INITIALIZE_PRIVATE_KHR = 0x2; // TODO: Find value
+
+}
\ No newline at end of file

Added: trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_spir.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_spir.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_spir.java	2012-12-02 16:53:25 UTC (rev 3833)
@@ -0,0 +1,40 @@
+/*
+ * 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.opencl;
+
+import org.lwjgl.util.generator.Extension;
+import org.lwjgl.util.generator.opencl.CLDeviceExtension;
+
+@CLDeviceExtension
+@Extension(postfix = "KHR", className = "KHRSPIR")
+public interface KHR_spir {
+}
\ No newline at end of file

Added: trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_terminate_context.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_terminate_context.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_terminate_context.java	2012-12-02 16:53:25 UTC (rev 3833)
@@ -0,0 +1,47 @@
+/*
+ * 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.opencl;
+
+import org.lwjgl.util.generator.PointerWrapper;
+import org.lwjgl.util.generator.opencl.CLDeviceExtension;
+import org.lwjgl.util.generator.opencl.cl_int;
+
+@CLDeviceExtension
+public interface KHR_terminate_context {
+
+	int CL_DEVICE_TERMINATE_CAPABILITY_KHR = 0x200F,
+		CL_CONTEXT_TERMINATE_KHR           = 0x2010;
+
+	@cl_int
+	int clTerminateContextKHR(@PointerWrapper("cl_context") CLContext context);
+
+}
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.