JavaCL: ignore mismatching byte order for byte buffers, and replaced mentions to getKernelsDefaultByteOrder() by getByteOrder() (issue #336)

ochafik · ochafik · commit 092f2eec3be2 · 2012-09-23T18:11:00.000+01:00
diff --git a/Core/src/main/velocity/com/nativelibs4java/opencl/CLContext.java b/Core/src/main/velocity/com/nativelibs4java/opencl/CLContext.java
@@ -683,8 +683,8 @@ private <T> CLBuffer<T> createBuffer(PointerIO<T> io, Pointer<T> data, long byte
         if (data != null) {
 			ByteOrder contextOrder = getByteOrder();
 			ByteOrder dataOrder = data.order();
-			if (contextOrder != null && !dataOrder.equals(contextOrder))
-				throw new IllegalArgumentException("Byte order of this context is " + contextOrder + ", but was given pointer to data with order " + dataOrder + ". Please create a pointer with correct byte order (Pointer.order(CLContext.getKernelsDefaultByteOrder())).");
+			if (contextOrder != null && !dataOrder.equals(contextOrder) && data.getTargetSize() > 1)
+				throw new IllegalArgumentException("Byte order of this context is " + contextOrder + ", but was given pointer to data with order " + dataOrder + ". Please create a pointer with correct byte order (Pointer.order(CLContext.getByteOrder())).");
 		}
         
 		#declareReusablePtrsAndPErr()
diff --git a/Core/src/main/velocity/com/nativelibs4java/opencl/CLPlatform.java b/Core/src/main/velocity/com/nativelibs4java/opencl/CLPlatform.java
@@ -166,7 +166,7 @@ Comparable extractValue(CLDevice device) {
             }
         },
         /**
-         * Prefer devices with the same byte ordering as the hosting platform (see {@link CLDevice#getKernelsDefaultByteOrder() })
+         * Prefer devices with the same byte ordering as the hosting platform (see {@link CLDevice#getByteOrder() })
          */
         NativeEndianness {
             Comparable extractValue(CLDevice device) {
diff --git a/Core/src/test/java/com/nativelibs4java/opencl/BufferTest.java b/Core/src/test/java/com/nativelibs4java/opencl/BufferTest.java
@@ -39,6 +39,19 @@ public static List<Object[]> getDeviceParameters() {
         return AbstractCommon.getDeviceParameters();
     }
 
+    static ByteOrder otherOrder(ByteOrder o) {
+    	return o.equals(ByteOrder.BIG_ENDIAN) ? ByteOrder.LITTLE_ENDIAN : ByteOrder.BIG_ENDIAN;
+    }
+    
+    @Test(expected = IllegalArgumentException.class)
+    public void testMismatchingOrder() {
+    	context.createBuffer(CLMem.Usage.InputOutput, allocateFloats(10).order(otherOrder(context.getByteOrder())));
+    }
+    @Test
+    public void testMismatchingByteOrder() {
+        context.createBuffer(CLMem.Usage.InputOutput, allocateBytes(10).order(otherOrder(context.getByteOrder())));
+    }
+    
     @Test
     public void testReadWrite() {
         for (Class<?> bufferClass : bufferClasses)

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ Comparable extractValue(CLDevice device) {`
`166`	`166`	`}`
`167`	`167`	`},`
`168`	`168`	`/**`
`169`		`- * Prefer devices with the same byte ordering as the hosting platform (see {@link CLDevice#getKernelsDefaultByteOrder() })`
	`169`	`+ * Prefer devices with the same byte ordering as the hosting platform (see {@link CLDevice#getByteOrder() })`
`170`	`170`	`*/`
`171`	`171`	`NativeEndianness {`
`172`	`172`	`Comparable extractValue(CLDevice device) {`