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

OpenGL 4.1 is supported in version 2.6 but in ContextAttribs.java
in function public ContextAttribs(final int majorVersion, final int 
minorVersion) highest supported value is 4.0.


Kind regards,
	Krešimir Jozić

Revision: 3463
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3463&view=rev
Author:   kappa1
Date:     2010-12-15 18:48:56 +0000 (Wed, 15 Dec 2010)

Log Message:
-----------
fix minor typo in javadoc/comments

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/input/Keyboard.java
    trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java

Modified: trunk/LWJGL/src/java/org/lwjgl/input/Keyboard.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/input/Keyboard.java	2010-12-13 11:35:47 UTC (rev 3462)
+++ trunk/LWJGL/src/java/org/lwjgl/input/Keyboard.java	2010-12-15 18:48:56 UTC (rev 3463)
@@ -541,7 +541,7 @@
 	}
 
 	/**
-	 * Gets the state of the tkey that generated the
+	 * Gets the state of the key that generated the
 	 * current event
 	 *
 	 * @return True if key was down, or false if released

Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2010-12-13 11:35:47 UTC (rev 3462)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2010-12-15 18:48:56 UTC (rev 3463)
@@ -925,7 +925,7 @@
 	 * Due to the way applets on plugin1 work, one jvm must
 	 * be used for all applets. We need to use multiple
 	 * classloaders in the same jvm due to LWJGL's static
-	 * nature. I order to solve this we simply remove the
+	 * nature. In order to solve this we simply remove the
 	 * natives from a previous classloader allowing a new
 	 * classloader to use those natives in the same jvm.
 	 *


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

Revision: 3462
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3462&view=rev
Author:   spasi
Date:     2010-12-13 11:35:47 +0000 (Mon, 13 Dec 2010)

Log Message:
-----------
Added EXT_texture_sRGB_decode.

Added Paths:
-----------
    trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_texture_sRGB_decode.java

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_texture_sRGB_decode.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_texture_sRGB_decode.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_texture_sRGB_decode.java	2010-12-13 11:35:47 UTC (rev 3462)
@@ -0,0 +1,53 @@
+/*
+ * 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 EXT_texture_sRGB_decode {
+
+	/**
+	 * Accepted by the <pname> parameter of TexParameterf, TexParameteri,
+	 * GetTexParameterfv, GetTexParameteriv, SamplerParameteri,
+	 * SamplerParameterf, SamplerParameteriv, SamplerParameterfv,
+	 * SamplerParameterIiv, SamplerParameterIuiv, GetSamplerParameteriv,
+	 * GetSamplerParameterfv, GetSamplerParameterIiv, and GetSamplerParameterIuiv:
+	 */
+	int GL_TEXTURE_SRGB_DECODE_EXT = 0x8A48;
+
+	/**
+	 * Accepted by the <enum> parameter of TexParameterf, TexParameteri,
+	 * SamplerParameteri, SamplerParameterf, SamplerParameteriv, SamplerParameterfv,
+	 * SamplerParameterIiv and SamplerParameterIuiv:
+	 */
+	int GL_DECODE_EXT = 0x8A49,
+		GL_SKIP_DECODE_EXT = 0x8A4A;
+
+}
\ No newline at end of file


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

Revision: 3461
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3461&view=rev
Author:   spasi
Date:     2010-12-06 15:58:11 +0000 (Mon, 06 Dec 2010)

Log Message:
-----------
Added clSetKernelArg support for CLObject and __local arguments.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opencl/CLKernel.java
    trunk/LWJGL/src/java/org/lwjgl/opencl/InfoUtilFactory.java
    trunk/LWJGL/src/templates/org/lwjgl/opencl/CL10.java

Modified: trunk/LWJGL/src/java/org/lwjgl/opencl/CLKernel.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opencl/CLKernel.java	2010-11-29 18:25:28 UTC (rev 3460)
+++ trunk/LWJGL/src/java/org/lwjgl/opencl/CLKernel.java	2010-12-06 15:58:11 UTC (rev 3461)
@@ -31,8 +31,6 @@
  */
 package org.lwjgl.opencl;
 
-import org.lwjgl.PointerWrapper;
-
 /**
  * This class is a wrapper around a cl_kernel pointer.
  *
@@ -145,11 +143,24 @@
 	 *
 	 * @return this CLKernel object
 	 */
-	public CLKernel setArg(final int index, final PointerWrapper value) {
+	public CLKernel setArg(final int index, final CLObject value) {
 		util.setArg(this, index, value);
 		return this;
 	}
 
+	/**
+	 * Sets the size of a __local kernel argument at the specified index.
+	 *
+	 * @param index the argument index
+	 * @param size  the argument size
+	 *
+	 * @return this CLKernel object
+	 */
+	public CLKernel setArgSize(final int index, final long size) {
+		util.setArgSize(this, index, size);
+		return this;
+	}
+
 	// clGetKernelInfo methods
 
 	/**
@@ -225,8 +236,10 @@
 
 		void setArg(CLKernel kernel, int index, double value);
 
-		void setArg(CLKernel kernel, int index, PointerWrapper pointer);
+		void setArg(CLKernel kernel, int index, CLObject pointer);
 
+		void setArgSize(CLKernel kernel, int index, long size);
+
 		long getWorkGroupInfoSize(CLKernel kernel, CLDevice device, int param_name);
 
 		long[] getWorkGroupInfoSizeArray(CLKernel kernel, CLDevice device, int param_name);

Modified: trunk/LWJGL/src/java/org/lwjgl/opencl/InfoUtilFactory.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opencl/InfoUtilFactory.java	2010-11-29 18:25:28 UTC (rev 3460)
+++ trunk/LWJGL/src/java/org/lwjgl/opencl/InfoUtilFactory.java	2010-12-06 15:58:11 UTC (rev 3461)
@@ -230,10 +230,14 @@
 			clSetKernelArg(kernel, index, 8, APIUtil.getBufferDouble().put(0, value));
 		}
 
-		public void setArg(final CLKernel kernel, final int index, final PointerWrapper pointer) {
-			clSetKernelArg(kernel, index, PointerBuffer.getPointerSize(), APIUtil.getBufferPointer().put(0, pointer).getBuffer());
+		public void setArg(final CLKernel kernel, final int index, final CLObject value) {
+			clSetKernelArg(kernel, index, value);
 		}
 
+		public void setArgSize(final CLKernel kernel, final int index, final long size) {
+			clSetKernelArg(kernel, index, size);
+		}
+
 		protected int getInfo(final CLKernel kernel, final int param_name, final ByteBuffer param_value, final PointerBuffer param_value_size_ret) {
 			return clGetKernelInfo(kernel, param_name, param_value, param_value_size_ret);
 		}

Modified: trunk/LWJGL/src/templates/org/lwjgl/opencl/CL10.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opencl/CL10.java	2010-11-29 18:25:28 UTC (rev 3460)
+++ trunk/LWJGL/src/templates/org/lwjgl/opencl/CL10.java	2010-12-06 15:58:11 UTC (rev 3461)
@@ -979,8 +979,8 @@
 	@cl_int
 	int clSetKernelArg(@PointerWrapper("cl_kernel") CLKernel kernel,
 	                   @cl_uint int arg_index,
-	                   @AutoSize(value = "arg_value", canBeNull = true) @size_t long arg_size,
-	                   @Check(canBeNull = true) @Const
+	                   @AutoSize("arg_value") @size_t long arg_size,
+	                   @Const
 	                   @cl_byte
 	                   @cl_short
 	                   @cl_int
@@ -988,17 +988,33 @@
 	                   @cl_float
 	                   @cl_double Buffer arg_value);
 
-	// This is used by CLKernelImpl. Assumes arg_value.position() == 0.
+	@Alternate("clSetKernelArg")
+	@cl_int
+	int clSetKernelArg(@PointerWrapper("cl_kernel") CLKernel kernel,
+	                   @cl_uint int arg_index,
+	                   @Constant("PointerBuffer.getPointerSize()") @size_t long arg_size,
+	                   @Check(canBeNull = true) @Const
+	                   @Constant(value = "APIUtil.getBufferPointer().put(0, arg_value == null ? 0 : arg_value.getPointer()).getBuffer(), 0", keepParam = true) CLObject arg_value);
 
+	/** Sets the size of a __local kernel argument at the specified index. */
 	@Alternate("clSetKernelArg")
-	@Private
 	@cl_int
 	int clSetKernelArg2(@PointerWrapper("cl_kernel") CLKernel kernel,
 	                    @cl_uint int arg_index,
 	                    @size_t long arg_size,
-	                    @Check(value = "1") @Const Buffer arg_value);
+	                    @Constant("null, 0") Buffer arg_value);
 
+	// This is used by CLKernelUtil. Assumes arg_value.position() == 0.
+
+	@Alternate("clSetKernelArg")
+	@Private
 	@cl_int
+	int clSetKernelArg3(@PointerWrapper("cl_kernel") CLKernel kernel,
+	                    @cl_uint int arg_index,
+	                    @size_t long arg_size,
+	                    @Constant(value = "arg_value, 0", keepParam = true) Buffer arg_value);
+
+	@cl_int
 	int clGetKernelInfo(@PointerWrapper("cl_kernel") CLKernel kernel,
 	                    @NativeType("cl_kernel_info") int param_name,
 	                    @AutoSize(value = "param_value", canBeNull = true) @size_t long param_value_size,


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