CL_DEVICE_PARTITION_AFFINITY_DOMAIN is a bit field, not a properties list

ochafik · ochafik · commit 3cedcfcb3412 · 2015-03-20T10:22:21.000Z
diff --git a/Core/src/main/velocity/com/nativelibs4java/opencl/CLDevice.java b/Core/src/main/velocity/com/nativelibs4java/opencl/CLDevice.java
@@ -764,19 +764,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.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++) {
-                long value = props.getSizeTAtIndex(i);
-                if (value == 0) {
-                  break;
-                }
-                ret.add(AffinityDomain.getEnum(value));
-            }
-        }
-        return ret;
+        return AffinityDomain.getEnumSet(infos.getIntOrLong(getEntity(), CL_DEVICE_PARTITION_AFFINITY_DOMAIN));
     }
 
     @InfoName("CL_DEVICE_PARTITION_MAX_SUB_DEVICES")
@@ -1169,6 +1157,9 @@ public enum AffinityDomain implements com.nativelibs4java.util.ValuedEnum {
         public static AffinityDomain getEnum(long v) {
             return EnumValues.getEnum(v, AffinityDomain.class);
         }
+        public static EnumSet<AffinityDomain> getEnumSet(long v) {
+            return EnumValues.getEnumSet(v, AffinityDomain.class);
+        }
     }
 
     /**
