Fix BufferTest expectation that buffer is nulled out (not true with AMD driver)

ochafik · ochafik · commit 95281fbb84eb · 2015-03-22T20:14:13.000Z
diff --git a/Core/src/main/velocity/com/nativelibs4java/opencl/CLBuffer.java b/Core/src/main/velocity/com/nativelibs4java/opencl/CLBuffer.java
@@ -569,10 +569,11 @@ public CLEvent copyBytesTo(CLQueue queue, CLBuffer destination, long sourceByteO
 #documentEventsToWaitForAndReturn()
      */
     public CLEvent copyElementsTo(CLQueue queue, CLBuffer destination, long sourceElementOffset, long destinationElementOffset, long elementCount, CLEvent... eventsToWaitFor) {
+        long elementSize = getElementSize();
         return copyBytesTo(queue, destination,
-            sourceElementOffset * getElementSize(),
-            destinationElementOffset * getElementSize(),
-            elementCount * getElementSize(),
+            sourceElementOffset * elementSize,
+            destinationElementOffset * elementSize,
+            elementCount * elementSize,
             eventsToWaitFor);
     }
 	
diff --git a/Core/src/test/java/com/nativelibs4java/opencl/BufferTest.java b/Core/src/test/java/com/nativelibs4java/opencl/BufferTest.java
@@ -166,14 +166,19 @@ public void testFill() {
         } catch (Throwable th) {}
     }
     @Test
-    public void testCopyTo() {
-        CLBuffer<Integer> b = context.createIntBuffer(CLMem.Usage.InputOutput, pointerToInts(1, 2, 3, 4));
-        CLBuffer<Integer> out = context.createIntBuffer(CLMem.Usage.InputOutput, 4);
-        CLEvent e = b.copyElementsTo(queue, out, 2, 1, 2);
-        assertArrayEquals(new int[] { 0, 3, 4, 0 }, out.read(queue, e).getInts());
-        
-        e = b.copyTo(queue, out);
-        assertArrayEquals(new int[] { 1, 2, 3, 4 }, out.read(queue, e).getInts());
+    public void testCopyTo_full() {
+        CLBuffer<Integer> b = context.createIntBuffer(CLMem.Usage.InputOutput, pointerToInts(1, 2, 3, 4, 5, 6));
+        CLBuffer<Integer> out = context.createIntBuffer(CLMem.Usage.InputOutput, 6);
+
+        CLEvent e = b.copyTo(queue, out);
+        assertArrayEquals(new int[] { 1, 2, 3, 4, 5, 6 }, out.read(queue, e).getInts());
     }
+    @Test
+    public void testCopyTo_partial() {
+        CLBuffer<Integer> b = context.createIntBuffer(CLMem.Usage.InputOutput, pointerToInts(1, 2, 3, 4, 5, 6));
+        CLBuffer<Integer> out = context.createIntBuffer(CLMem.Usage.InputOutput, 6);
 
+        CLEvent e = b.copyElementsTo(queue, out, 2, 1, 2);
+        assertArrayEquals(new int[] { 3, 4 }, out.read(queue, e).next().validElements(2).getInts());
+    }
 }
