JavaCL-JNA: Fix build

ochafik · ochafik · commit b88cf2c8f533 · 2013-07-22T00:23:31.000+01:00
diff --git a/Generator/src/main/java/com/nativelibs4java/opencl/generator/JavaCLGenerator.java b/Generator/src/main/java/com/nativelibs4java/opencl/generator/JavaCLGenerator.java
@@ -101,7 +101,11 @@ public void initTypes() {
 
                     }
 
-                    
+                    @Override
+                    protected Identifier packageMember(Identifier libraryPackage, Identifier name) {
+                        return name;
+                    }
+
                     @Override
                     public boolean isObjCppPrimitive(String s) {
                         int len;
@@ -149,7 +153,7 @@ public void convertFunction(Function function, Signatures signatures, boolean is
                                 return;
 
                             try {
-                                tr = result.typeConverter.resolveTypeDef(tr, libraryClassName, true, false);
+                                tr = result.typeConverter.resolveTypeDef(tr, null/*libraryClassName*/, false, false);
                                 List<Modifier> mods = arg.harvestModifiers();
 
                                 TypeRef convTr;
@@ -339,17 +343,27 @@ private Conversion convertTypeToJavaCL(Result result, String argName, TypeRef va
             TypeRef target = ((TypeRef.Pointer)valueType).getTarget();
             if (target instanceof TypeRef.SimpleTypeRef) {
                 TypeRef.SimpleTypeRef starget = (TypeRef.SimpleTypeRef)target;
-
-                Pair<Integer, Class<?>> pair = buffersAndArityByType.get((starget + "").equals("long") ? "long" : starget.getName() + "");
+                Identifier name = starget.getName();
+                
+                Pair<Integer, Class<?>> pair = buffersAndArityByType.get((starget + "").equals("long") ? "long" : name + "");
                 if (pair != null) {
                     ret.outerJavaTypeRef = typeRef(ident(CLBuffer.class, expr(typeRef(pair.getSecond()))));
                     return ret;
                 }
-                Identifier ref = result.typeConverter.findRef(starget.getName(), target, libraryClassName, true);
+                Identifier ref = 
+                    result.structsFullNames.contains(name) ||
+                    result.enumsFullNames.contains(name) ?
+                    name : result.typeConverter.findRef(name, target, libraryClassName, true);
                 if (ref != null) {
                     ret.outerJavaTypeRef = typeRef(ident(CLBuffer.class, expr(typeRef(ref))));
                     return ret;
                 }
+            } else if (target instanceof Struct) {
+                TypeRef ref = result.typeConverter.findStructRef((Struct)target, libraryClassName);
+                if (ref != null) {
+                    ret.outerJavaTypeRef = typeRef(ident(CLBuffer.class, expr(ref)));
+                    return ret;
+                }
             }
             throw new UnsupportedConversionException(valueType, "Unknown pointed target type");
         } else if (valueType instanceof TypeRef.SimpleTypeRef) {
diff --git a/OpenGLDemos/pom.xml b/OpenGLDemos/pom.xml
@@ -26,6 +26,17 @@
 	  <groupId>com.nativelibs4java</groupId>
 	  <artifactId>javacl-demos</artifactId>
 	</dependency>
+		
+       <dependency>
+         <groupId>org.jogamp.gluegen</groupId>
+         <artifactId>gluegen-rt-main</artifactId>
+         <version>2.0.2-rc12</version>
+       </dependency>
+       <dependency>
+         <groupId>org.jogamp.jogl</groupId>
+         <artifactId>jogl-all-main</artifactId>
+         <version>2.0.2-rc12</version>
+       </dependency>
 
     <dependency>
       <groupId>org.swinglabs</groupId>
