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

Revision: 3558
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3558&view=rev
Author:   spasi
Date:     2011-07-09 21:56:22 +0000 (Sat, 09 Jul 2011)

Log Message:
-----------
Removed __cdecl workaround.

Modified Paths:
--------------
    trunk/LWJGL/src/native/common/extcl.h
    trunk/LWJGL/src/native/common/org_lwjgl_opencl_CallbackUtil.c

Modified: trunk/LWJGL/src/native/common/extcl.h
===================================================================
--- trunk/LWJGL/src/native/common/extcl.h	2011-07-09 10:20:48 UTC (rev 3557)
+++ trunk/LWJGL/src/native/common/extcl.h	2011-07-09 21:56:22 UTC (rev 3558)
@@ -59,18 +59,11 @@
     #define CL_CALLBACK
 #endif
 
-// TODO: This is a bug in current CL implementations (AMD's only?), remove when fixed. (used for cl_native_kernel_func)
-#if defined(_WIN32)
-    #define CL_USER_FUNC_CALLBACK   __cdecl
-#else
-    #define CL_USER_FUNC_CALLBACK   CL_CALLBACK
-#endif
-
 typedef void (CL_CALLBACK * cl_create_context_callback)(const char *errinfo, const void *private_info, size_t cb, void *user_data);
 typedef void (CL_CALLBACK * cl_mem_object_destructor_callback)(cl_mem memobj, void *user_data);
 typedef void (CL_CALLBACK * cl_build_program_callback)(cl_program program, void *user_data);
 typedef void (CL_CALLBACK * cl_event_callback)(cl_event event, cl_int event_command_exec_status, void *user_data);
-typedef void (CL_USER_FUNC_CALLBACK * cl_native_kernel_func)(void *args);
+typedef void (CL_CALLBACK * cl_native_kernel_func)(void *args);
 
 // -----------------[ Cross-platform functions ]-----------------
 

Modified: trunk/LWJGL/src/native/common/org_lwjgl_opencl_CallbackUtil.c
===================================================================
--- trunk/LWJGL/src/native/common/org_lwjgl_opencl_CallbackUtil.c	2011-07-09 10:20:48 UTC (rev 3557)
+++ trunk/LWJGL/src/native/common/org_lwjgl_opencl_CallbackUtil.c	2011-07-09 21:56:22 UTC (rev 3558)
@@ -142,7 +142,7 @@
 
 // ----------------- [ NATIVE KERNEL CALLBACK ] -----------------
 
-static void CL_USER_FUNC_CALLBACK nativeKernelCallback(void *args) {
+static void CL_CALLBACK nativeKernelCallback(void *args) {
     JNIEnv *env = attachCurrentThread();
     jobject user_func = (jobject)(intptr_t)*(jlong *)args;
     jint num_mem_objects = *(jint *)((char *)args + 8);


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

Revision: 3557
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3557&view=rev
Author:   spasi
Date:     2011-07-09 10:20:48 +0000 (Sat, 09 Jul 2011)

Log Message:
-----------
Added support for EXT_framebuffer_multisample_blit_scaled.

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

Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_framebuffer_multisample_blit_scaled.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_framebuffer_multisample_blit_scaled.java	                        (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_framebuffer_multisample_blit_scaled.java	2011-07-09 10:20:48 UTC (rev 3557)
@@ -0,0 +1,40 @@
+/*
+ * 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 EXT_framebuffer_multisample_blit_scaled {
+
+	/** Accepted by the <filter> parameter of BlitFramebuffer: */
+	int GL_SCALED_RESOLVE_FASTEST_EXT = 0x90BA,
+		GL_SCALED_RESOLVE_NICEST_EXT  = 0x90BB;
+
+}


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