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

Revision: 3431
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3431&view=rev
Author:   spasi
Date:     2010-10-04 22:51:19 +0000 (Mon, 04 Oct 2010)

Log Message:
-----------
Fixed 64bit loading.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/Sys.java

Removed Paths:
-------------
    trunk/LWJGL/src/native/common/org_lwjgl_opencl_CL.h
    trunk/LWJGL/src/native/common/org_lwjgl_opencl_CallbackUtil.h
    trunk/LWJGL/src/native/common/org_lwjgl_opengl_CallbackUtil.h

Modified: trunk/LWJGL/src/java/org/lwjgl/Sys.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/Sys.java	2010-10-04 17:04:46 UTC (rev 3430)
+++ trunk/LWJGL/src/java/org/lwjgl/Sys.java	2010-10-04 22:51:19 UTC (rev 3431)
@@ -84,6 +84,7 @@
 			if (implementation.has64Bit()) {
 				try {
 					doLoadLibrary(lib_name + POSTFIX64BIT);
+					return;
 				} catch (UnsatisfiedLinkError e2) {
 					LWJGLUtil.log("Failed to load 64 bit library: " + e2.getMessage());
 				}

Deleted: trunk/LWJGL/src/native/common/org_lwjgl_opencl_CL.h
===================================================================
--- trunk/LWJGL/src/native/common/org_lwjgl_opencl_CL.h	2010-10-04 17:04:46 UTC (rev 3430)
+++ trunk/LWJGL/src/native/common/org_lwjgl_opencl_CL.h	2010-10-04 22:51:19 UTC (rev 3431)
@@ -1,62 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class org_lwjgl_opencl_CL */
-
-#ifndef _Included_org_lwjgl_opencl_CL
-#define _Included_org_lwjgl_opencl_CL
-#ifdef __cplusplus
-extern "C" {
-#endif
-/* Inaccessible static: created */
-/*
- * Class:     org_lwjgl_opencl_CL
- * Method:    nCreate
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opencl_CL_nCreate
-  (JNIEnv *, jclass, jstring);
-
-/*
- * Class:     org_lwjgl_opencl_CL
- * Method:    nCreateDefault
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opencl_CL_nCreateDefault
-  (JNIEnv *, jclass);
-
-/*
- * Class:     org_lwjgl_opencl_CL
- * Method:    nDestroy
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opencl_CL_nDestroy
-  (JNIEnv *, jclass);
-
-/*
- * Class:     org_lwjgl_opencl_CL
- * Method:    getFunctionAddress
- * Signature: (Ljava/lang/String;)J
- */
-JNIEXPORT jlong JNICALL Java_org_lwjgl_opencl_CL_getFunctionAddress
-  (JNIEnv *, jclass, jstring);
-
-/*
- * Class:     org_lwjgl_opencl_CL
- * Method:    getHostBuffer
- * Signature: (JI)Ljava/nio/ByteBuffer;
- */
-JNIEXPORT jobject JNICALL Java_org_lwjgl_opencl_CL_getHostBuffer
-  (JNIEnv *, jclass, jlong, jint);
-
-/*
- * Class:     org_lwjgl_opencl_CL
- * Method:    resetNativeStubs
- * Signature: (Ljava/lang/Class;)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opencl_CL_resetNativeStubs
-  (JNIEnv *, jclass, jclass);
-
-#ifdef __cplusplus
-}
-#endif
-#endif

Deleted: trunk/LWJGL/src/native/common/org_lwjgl_opencl_CallbackUtil.h
===================================================================
--- trunk/LWJGL/src/native/common/org_lwjgl_opencl_CallbackUtil.h	2010-10-04 17:04:46 UTC (rev 3430)
+++ trunk/LWJGL/src/native/common/org_lwjgl_opencl_CallbackUtil.h	2010-10-04 22:51:19 UTC (rev 3431)
@@ -1,94 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class org_lwjgl_opencl_CallbackUtil */
-
-#ifndef _Included_org_lwjgl_opencl_CallbackUtil
-#define _Included_org_lwjgl_opencl_CallbackUtil
-#ifdef __cplusplus
-extern "C" {
-#endif
-/* Inaccessible static: contextUserData */
-/*
- * Class:     org_lwjgl_opencl_CallbackUtil
- * Method:    ncreateGlobalRef
- * Signature: (Ljava/lang/Object;)J
- */
-JNIEXPORT jlong JNICALL Java_org_lwjgl_opencl_CallbackUtil_ncreateGlobalRef
-  (JNIEnv *, jclass, jobject);
-
-/*
- * Class:     org_lwjgl_opencl_CallbackUtil
- * Method:    deleteGlobalRef
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opencl_CallbackUtil_deleteGlobalRef
-  (JNIEnv *, jclass, jlong);
-
-/*
- * Class:     org_lwjgl_opencl_CallbackUtil
- * Method:    getContextCallback
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_org_lwjgl_opencl_CallbackUtil_getContextCallback
-  (JNIEnv *, jclass);
-
-/*
- * Class:     org_lwjgl_opencl_CallbackUtil
- * Method:    getMemObjectDestructorCallback
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_org_lwjgl_opencl_CallbackUtil_getMemObjectDestructorCallback
-  (JNIEnv *, jclass);
-
-/*
- * Class:     org_lwjgl_opencl_CallbackUtil
- * Method:    getBuildProgramCallback
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_org_lwjgl_opencl_CallbackUtil_getBuildProgramCallback
-  (JNIEnv *, jclass);
-
-/*
- * Class:     org_lwjgl_opencl_CallbackUtil
- * Method:    getNativeKernelCallback
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_org_lwjgl_opencl_CallbackUtil_getNativeKernelCallback
-  (JNIEnv *, jclass);
-
-/*
- * Class:     org_lwjgl_opencl_CallbackUtil
- * Method:    getEventCallback
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_org_lwjgl_opencl_CallbackUtil_getEventCallback
-  (JNIEnv *, jclass);
-
-/*
- * Class:     org_lwjgl_opencl_CallbackUtil
- * Method:    getLogMessageToSystemLogAPPLE
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_org_lwjgl_opencl_CallbackUtil_getLogMessageToSystemLogAPPLE
-  (JNIEnv *, jclass);
-
-/*
- * Class:     org_lwjgl_opencl_CallbackUtil
- * Method:    getLogMessageToStdoutAPPLE
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_org_lwjgl_opencl_CallbackUtil_getLogMessageToStdoutAPPLE
-  (JNIEnv *, jclass);
-
-/*
- * Class:     org_lwjgl_opencl_CallbackUtil
- * Method:    getLogMessageToStderrAPPLE
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_org_lwjgl_opencl_CallbackUtil_getLogMessageToStderrAPPLE
-  (JNIEnv *, jclass);
-
-#ifdef __cplusplus
-}
-#endif
-#endif

Deleted: trunk/LWJGL/src/native/common/org_lwjgl_opengl_CallbackUtil.h
===================================================================
--- trunk/LWJGL/src/native/common/org_lwjgl_opengl_CallbackUtil.h	2010-10-04 17:04:46 UTC (rev 3430)
+++ trunk/LWJGL/src/native/common/org_lwjgl_opengl_CallbackUtil.h	2010-10-04 22:51:19 UTC (rev 3431)
@@ -1,47 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class org_lwjgl_opengl_CallbackUtil */
-
-#ifndef _Included_org_lwjgl_opengl_CallbackUtil
-#define _Included_org_lwjgl_opengl_CallbackUtil
-#ifdef __cplusplus
-extern "C" {
-#endif
-/* Inaccessible static: contextUserParamsARB */
-/* Inaccessible static: contextUserParamsAMD */
-/*
- * Class:     org_lwjgl_opengl_CallbackUtil
- * Method:    ncreateGlobalRef
- * Signature: (Ljava/lang/Object;)J
- */
-JNIEXPORT jlong JNICALL Java_org_lwjgl_opengl_CallbackUtil_ncreateGlobalRef
-  (JNIEnv *, jclass, jobject);
-
-/*
- * Class:     org_lwjgl_opengl_CallbackUtil
- * Method:    deleteGlobalRef
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CallbackUtil_deleteGlobalRef
-  (JNIEnv *, jclass, jlong);
-
-/*
- * Class:     org_lwjgl_opengl_CallbackUtil
- * Method:    getDebugOutputCallbackARB
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_org_lwjgl_opengl_CallbackUtil_getDebugOutputCallbackARB
-  (JNIEnv *, jclass);
-
-/*
- * Class:     org_lwjgl_opengl_CallbackUtil
- * Method:    getDebugOutputCallbackAMD
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_org_lwjgl_opengl_CallbackUtil_getDebugOutputCallbackAMD
-  (JNIEnv *, jclass);
-
-#ifdef __cplusplus
-}
-#endif
-#endif


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

Revision: 3430
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3430&view=rev
Author:   spasi
Date:     2010-10-04 17:04:46 +0000 (Mon, 04 Oct 2010)

Log Message:
-----------
Minor clean-up.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/generator/GeneratorProcessorFactory.java
    trunk/LWJGL/src/java/org/lwjgl/util/generator/GeneratorVisitor.java
    trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java
    trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaTypeTranslator.java
    trunk/LWJGL/src/native/common/org_lwjgl_opencl_CallbackUtil.c

Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/GeneratorProcessorFactory.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/GeneratorProcessorFactory.java	2010-10-02 13:07:46 UTC (rev 3429)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/GeneratorProcessorFactory.java	2010-10-04 17:04:46 UTC (rev 3430)
@@ -38,8 +38,6 @@
 import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 
 import com.sun.mirror.apt.*;
 import com.sun.mirror.declaration.AnnotationTypeDeclaration;

Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/GeneratorVisitor.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/GeneratorVisitor.java	2010-10-02 13:07:46 UTC (rev 3429)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/GeneratorVisitor.java	2010-10-04 17:04:46 UTC (rev 3430)
@@ -110,10 +110,6 @@
 			NativeType native_type_annotation = NativeTypeTranslator.getAnnotation(annotation, NativeType.class);
 			if (native_type_annotation != null) {
 				Class<? extends Annotation> annotation_type = NativeTypeTranslator.getClassFromType(annotation.getAnnotationType());
-					/*System.out.println("\nYO:");
-					System.out.println("annotation = " + annotation);
-					System.out.println("native_type_annotation = " + native_type_annotation);
-					System.out.println("annotation_type = " + annotation_type);*/
 				Class type = Utils.getJavaType(type_mirror);
 				if (Buffer.class.equals(type))
 					continue;
@@ -229,10 +225,8 @@
 		native_writer.println("#include <jni.h>");
 		type_map.printNativeIncludes(native_writer);
 		native_writer.println();
-		//if ( d.getAnnotation(NoTypeDefs.class) == null ) {
 		TypedefsGenerator.generateNativeTypedefs(type_map, native_writer, d.getMethods());
 		native_writer.println();
-		//}
 		if (!context_specific) {
 			generateMethodsNativePointers(native_writer, d.getMethods());
 			native_writer.println();

Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java	2010-10-02 13:07:46 UTC (rev 3429)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java	2010-10-04 17:04:46 UTC (rev 3430)
@@ -134,7 +134,7 @@
 						first_parameter = false;
 						if ( printTypes )
 							writer.print("boolean ");
-						writer.print( TypeInfo.UNSIGNED_PARAMETER_NAME);
+						writer.print(TypeInfo.UNSIGNED_PARAMETER_NAME);
 					}
 				}
 			} else if (

Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaTypeTranslator.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaTypeTranslator.java	2010-10-02 13:07:46 UTC (rev 3429)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaTypeTranslator.java	2010-10-04 17:04:46 UTC (rev 3430)
@@ -74,27 +74,6 @@
 				throw new RuntimeException(e);
 			}
 		}
-
-		/*
-		final String className = t.getComponentType().toString();
-		if ( "java.lang.CharSequence".equals(className) )
-			type = CharSequence[].class;
-		else if ( "java.nio.ByteBuffer".equals(className) )
-			type = ByteBuffer[].class;
-		else if ( "org.lwjgl.opencl.CLMem".equals(className) )
-			type = CLMem[].class;
-		else
-			throw new RuntimeException(t + " is not allowed");
-			//*/
-		/*
-		try {
-			System.out.println("t = " + t);
-			System.out.println("t.getClass() = " + t.getClass());
-			System.out.println("t.getComponentType() = " + t.getComponentType());
-			type = Class.forName(t.toString());
-		} catch (ClassNotFoundException e) {
-			throw new RuntimeException(e);
-		}*/
 	}
 
 	public static Class getPrimitiveClassFromKind(PrimitiveType.Kind kind) {

Modified: trunk/LWJGL/src/native/common/org_lwjgl_opencl_CallbackUtil.c
===================================================================
--- trunk/LWJGL/src/native/common/org_lwjgl_opencl_CallbackUtil.c	2010-10-02 13:07:46 UTC (rev 3429)
+++ trunk/LWJGL/src/native/common/org_lwjgl_opencl_CallbackUtil.c	2010-10-04 17:04:46 UTC (rev 3430)
@@ -144,7 +144,7 @@
 
 static void CL_USER_FUNC_CALLBACK nativeKernelCallback(void *args) {
     JNIEnv *env = attachCurrentThread();
-    jobject user_func = (jobject)*(intptr_t *)args;
+    jobject user_func = (jobject)(intptr_t)*(jlong *)args;
     jint num_mem_objects = *(jint *)((char *)args + 8);
     jobjectArray memobjs = NULL;
     jobject buffer;


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