JavaCL: deprecated CLContext.getKernelsDefaultByteOrder() and CLDevice.getKernelsDefaultByteOrder()

ochafik · ochafik · commit 82fc3b96132e · 2012-03-10T16:29:40.000Z
diff --git a/Core/src/main/java/com/nativelibs4java/opencl/CLDevice.java b/Core/src/main/java/com/nativelibs4java/opencl/CLDevice.java
@@ -102,15 +102,19 @@ public static Map<String, List<CLDevice>> getDevicesBySignature(List<CLDevice> d
         return ret;
     }
 
-
+    private volatile ByteOrder byteOrder;
     public ByteOrder getByteOrder() {
-        return isEndianLittle() ? ByteOrder.LITTLE_ENDIAN : ByteOrder.BIG_ENDIAN;
+    	if (byteOrder == null)
+    		byteOrder = isEndianLittle() ? ByteOrder.LITTLE_ENDIAN : ByteOrder.BIG_ENDIAN;
+    	return byteOrder;
     }
 
-    ByteOrder kernelsDefaultByteOrder;
+    /**
+     * @deprecated Use {@link CLDevice#getByteOrder()}
+     */
+    @Deprecated
     public synchronized ByteOrder getKernelsDefaultByteOrder() {
-        if (kernelsDefaultByteOrder == null) {
-            kernelsDefaultByteOrder = getByteOrder();//ByteOrder.nativeOrder();
+    	return getByteOrder();
             /*
             CLPlatform platform = getPlatform();
             if (platform != null && platform.getVendor().toLowerCase().contains("nvidia"))
@@ -158,8 +162,6 @@ public synchronized ByteOrder getKernelsDefaultByteOrder() {
                     context.release();
                 }
             }//*/
-        }
-        return kernelsDefaultByteOrder;
     }
 
     /** Bit values for CL_DEVICE_EXECUTION_CAPABILITIES */
diff --git a/Core/src/main/velocity/com/nativelibs4java/opencl/CLContext.java b/Core/src/main/velocity/com/nativelibs4java/opencl/CLContext.java
@@ -650,19 +650,11 @@ private <T> CLBuffer<T> createBuffer(PointerIO<T> io, Pointer<T> data, long byte
 	}
 
     /**
-     * The OpenCL specification states that the default endianness of kernel arguments is that of the device.<br/>
-     * However, there are implementations where this does not appear to be respected, so it is compulsory to perform a runtime test on those platforms.
-     * @return byte order needed for pointer kernel arguments that do not have any <code>__attribute__ ((endian(device))</code> or <code>__attribute__ ((endian(host))</code> attribute.
+     * @deprecated Use {@link CLContext#getByteOrder()}
      */
+    @Deprecated
     public ByteOrder getKernelsDefaultByteOrder() {
-        ByteOrder order = null;
-        for (CLDevice device : getDevices()) {
-            ByteOrder devOrder = device.getKernelsDefaultByteOrder();
-            if (order != null && devOrder != order)
-                return null;
-            order = devOrder;
-        }
-        return order;
+        return getByteOrder();
     }
 
     /**
diff --git a/Tutorials/Simple/src/main/resources/archetype-resources/src/main/java/JavaCLTutorial1.java b/Tutorials/Simple/src/main/resources/archetype-resources/src/main/java/JavaCLTutorial1.java
@@ -13,7 +13,7 @@ public class JavaCLTutorial1 {
     public static void main(String[] args) throws IOException {
         CLContext context = JavaCL.createBestContext();
         CLQueue queue = context.createDefaultQueue();
-        ByteOrder byteOrder = context.getKernelsDefaultByteOrder();
+        ByteOrder byteOrder = context.getByteOrder();
         
         int n = 1024;
         Pointer<Float>
diff --git a/Tutorials/Simple/src/main/resources/archetype-resources/src/main/java/JavaCLTutorial2.java b/Tutorials/Simple/src/main/resources/archetype-resources/src/main/java/JavaCLTutorial2.java
@@ -13,7 +13,7 @@ public class JavaCLTutorial2 {
     public static void main(String[] args) throws IOException {
         CLContext context = JavaCL.createBestContext();
         CLQueue queue = context.createDefaultQueue();
-        ByteOrder byteOrder = context.getKernelsDefaultByteOrder();
+        ByteOrder byteOrder = context.getByteOrder();
         
         int n = 1024;
         Pointer<Float>
