fix previous typo (infos.getPointer instead of infos.getMemory) that doesn't show up with macbook air fission-averse devices

ochafik · ochafik · commit 5bcfdac78b52 · 2015-03-20T01:14:36.000Z
diff --git a/Core/src/main/velocity/com/nativelibs4java/opencl/CLDevice.java b/Core/src/main/velocity/com/nativelibs4java/opencl/CLDevice.java
@@ -744,7 +744,7 @@ public EnumSet<PartitionType> getPartitionType() {
 
     private EnumSet<PartitionType> getPartitionTypeInfo(int info) {
         EnumSet<PartitionType> ret = EnumSet.noneOf(PartitionType.class);
-        Pointer<?> ptr = infos.getPointer(getEntity(), info);
+        Pointer<?> ptr = infos.getMemory(getEntity(), info);
         if (ptr != null) {
             Pointer<SizeT> props = ptr.as(SizeT.class);
             for (long i = 0, n = props.getValidElements(); i < n; i++) {
@@ -765,7 +765,7 @@ private EnumSet<PartitionType> getPartitionTypeInfo(int info) {
     @InfoName("CL_DEVICE_PARTITION_AFFINITY_DOMAIN")
     public EnumSet<AffinityDomain> getPartitionAffinityDomains() {
         EnumSet<AffinityDomain> ret = EnumSet.noneOf(AffinityDomain.class);
-        Pointer<?> ptr = infos.getPointer(getEntity(), CL_DEVICE_PARTITION_AFFINITY_DOMAIN);;
+        Pointer<?> ptr = infos.getMemory(getEntity(), CL_DEVICE_PARTITION_AFFINITY_DOMAIN);
         if (ptr != null) {
             Pointer<SizeT> props = ptr.as(SizeT.class);
             for (long i = 0, n = props.getValidElements(); i < n; i++) {
diff --git a/Core/src/test/java/com/nativelibs4java/opencl/KernelTest.java b/Core/src/test/java/com/nativelibs4java/opencl/KernelTest.java
@@ -43,7 +43,7 @@ public <T> Object testArrayArg(String type, Object array, Class<T> targetType) {
         CLBuffer<Byte> out = context.createByteBuffer(Usage.Output, size * length);
         StringBuilder b = new StringBuilder(
             "#pragma OPENCL EXTENSION cl_khr_fp64 : enable\n" +
-            "kernel void f(constant " + type + length + " arg, global " + type + "* out, long length) {\n");
+            "kernel void f(" + type + length + " arg, global " + type + "* out, long length) {\n");
         for (long i = 0; i < length; i++) {
             b.append("out[" + i + "] = arg.s" + (i < 10 ? i + "" : ((char)((int)'a' + (i - 10))) + "") + ";\n");
         }

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public <T> Object testArrayArg(String type, Object array, Class<T> targetType) {`
`43`	`43`	`CLBuffer<Byte> out = context.createByteBuffer(Usage.Output, size * length);`
`44`	`44`	`StringBuilder b = new StringBuilder(`
`45`	`45`	`"#pragma OPENCL EXTENSION cl_khr_fp64 : enable\n" +`
`46`		`- "kernel void f(constant " + type + length + " arg, global " + type + "* out, long length) {\n");`
	`46`	`+ "kernel void f(" + type + length + " arg, global " + type + "* out, long length) {\n");`
`47`	`47`	`for (long i = 0; i < length; i++) {`
`48`	`48`	`b.append("out[" + i + "] = arg.s" + (i < 10 ? i + "" : ((char)((int)'a' + (i - 10))) + "") + ";\n");`
`49`	`49`	`}`