From: <sp...@us...> - 2010-10-01 00:18:51
|
Revision: 3423 http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3423&view=rev Author: spasi Date: 2010-10-01 00:18:45 +0000 (Fri, 01 Oct 2010) Log Message: ----------- More CL fixes. Modified Paths: -------------- trunk/LWJGL/src/templates/org/lwjgl/opencl/APPLE_gl_sharing.java trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_gl_sharing.java Removed Paths: ------------- trunk/LWJGL/src/templates/org/lwjgl/opencl/AMD_event_callback.java Deleted: trunk/LWJGL/src/templates/org/lwjgl/opencl/AMD_event_callback.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opencl/AMD_event_callback.java 2010-09-30 23:36:37 UTC (rev 3422) +++ trunk/LWJGL/src/templates/org/lwjgl/opencl/AMD_event_callback.java 2010-10-01 00:18:45 UTC (rev 3423) @@ -1,39 +0,0 @@ -/* - * 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.opencl; - -import org.lwjgl.util.generator.opencl.CLPlatformExtension; - -@CLPlatformExtension -public interface AMD_event_callback { - // Not implemented -} \ No newline at end of file Modified: trunk/LWJGL/src/templates/org/lwjgl/opencl/APPLE_gl_sharing.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opencl/APPLE_gl_sharing.java 2010-09-30 23:36:37 UTC (rev 3422) +++ trunk/LWJGL/src/templates/org/lwjgl/opencl/APPLE_gl_sharing.java 2010-10-01 00:18:45 UTC (rev 3423) @@ -69,7 +69,7 @@ @Code( javaBeforeNative = "\t\tif ( param_value_size_ret == null && APIUtil.isDevicesParam(param_name) ) param_value_size_ret = APIUtil.getBufferPointer();", - javaAfterNative = "\t\tif ( __result == CL_SUCCESS && param_value != null && APIUtil.isDevicesParam(param_name) ) context.getParent().registerCLDevices(param_value, param_value_size_ret);" + javaAfterNative = "\t\tif ( __result == CL10.CL_SUCCESS && param_value != null && APIUtil.isDevicesParam(param_name) ) context.getParent().registerCLDevices(param_value, param_value_size_ret);" ) @cl_int int clGetGLContextInfoAPPLE(@PointerWrapper("cl_context") CLContext context, Modified: trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_gl_sharing.java =================================================================== --- trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_gl_sharing.java 2010-09-30 23:36:37 UTC (rev 3422) +++ trunk/LWJGL/src/templates/org/lwjgl/opencl/KHR_gl_sharing.java 2010-10-01 00:18:45 UTC (rev 3423) @@ -65,7 +65,7 @@ @Code( javaBeforeNative = "\t\tif ( param_value_size_ret == null && APIUtil.isDevicesParam(param_name) ) param_value_size_ret = APIUtil.getBufferPointer();", - javaAfterNative = "\t\tif ( __result == CL_SUCCESS && param_value != null && APIUtil.isDevicesParam(param_name) ) APIUtil.getCLPlatform(properties).registerCLDevices(param_value, param_value_size_ret);" + javaAfterNative = "\t\tif ( __result == CL10.CL_SUCCESS && param_value != null && APIUtil.isDevicesParam(param_name) ) APIUtil.getCLPlatform(properties).registerCLDevices(param_value, param_value_size_ret);" ) @cl_int int clGetGLContextInfoKHR(@NullTerminated @Const @NativeType("cl_context_properties") PointerBuffer properties, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |