JavaCL: added CLImage.fillImage (issue #232)

ochafik · ochafik · commit 9f402b3ebb80 · 2014-01-29T00:08:35.000Z
diff --git a/Core/src/main/velocity/com/nativelibs4java/opencl/CLImage.java b/Core/src/main/velocity/com/nativelibs4java/opencl/CLImage.java
@@ -2,6 +2,7 @@
 package com.nativelibs4java.opencl;
 import static com.nativelibs4java.opencl.CLException.error;
 import static com.nativelibs4java.opencl.JavaCL.CL;
+import static com.nativelibs4java.opencl.JavaCL.check;
 import static com.nativelibs4java.opencl.library.IOpenCLLibrary.CL_FALSE;
 import static com.nativelibs4java.opencl.library.IOpenCLLibrary.CL_IMAGE_ELEMENT_SIZE;
 import static com.nativelibs4java.opencl.library.IOpenCLLibrary.CL_IMAGE_FORMAT;
@@ -37,7 +38,7 @@ public abstract class CLImage extends CLMem {
 		this.format = format;
 	}
 
-
+	protected abstract long[] getDimensions();
 
 	/**
 	 * Return image format descriptor specified when image is created with CLContext.create{Input|Output|InputOutput}{2D|3D}.
@@ -124,6 +125,65 @@ public void run() {
 		return evt;
 	}
 
+    /**
+#documentCallsFunction("clEnqueueFillImage")
+     * @param queue
+     * @param queue Queue on which to enqueue this fill buffer command.
+     * @param color Color components to fill the buffer with.
+     * @param origin Origin point.
+     * @param region Size of the region to fill.
+#documentEventsToWaitForAndReturn()
+     */
+    public CLEvent fillImage(CLQueue queue, Object color, CLEvent... eventsToWaitFor) {
+    	long[] region = getDimensions();
+    	long[] origin = new long[region.length];
+    	return fillImage(queue, color, origin, region, eventsToWaitFor);
+    }
+
+    /**
+#documentCallsFunction("clEnqueueFillImage")
+     * @param queue
+     * @param queue Queue on which to enqueue this fill buffer command.
+     * @param color Color components to fill the buffer with.
+     * @param origin Origin point.
+     * @param region Size of the region to fill.
+#documentEventsToWaitForAndReturn()
+     */
+    public CLEvent fillImage(CLQueue queue, Object color, long[] origin, long[] region, CLEvent... eventsToWaitFor) {
+    	context.getPlatform().requireMinVersionValue("clEnqueueFillImage", 1.2);
+		Pointer<?> pColor;
+		if (color instanceof int[]) {
+			pColor = pointerToInts((int[]) color);
+		} else if (color instanceof float[]) {
+			pColor = pointerToFloats((float[]) color);
+		} else {
+			throw new IllegalArgumentException("Color should be an int[] or a float[] with 4 elements.");
+		}
+		check(pColor.getValidElements() == 4, "Color should have 4 elements.");
+
+		#declareReusablePtrsAndEventsInOut()
+		Pointer<SizeT> pOrigin = ptrs.sizeT3_1.pointerToSizeTs(origin);
+		Pointer<SizeT> pRegion = ptrs.sizeT3_2.pointerToSizeTs(region);
+		error(CL.clEnqueueFillImage(
+			queue.getEntity(),
+			getEntity(),
+			getPeer(pColor),
+			getPeer(pOrigin),
+			getPeer(pRegion),
+			#eventsInOutArgsRaw()
+		));
+        #returnEventOut("queue")
+    }
+
+	// clEnqueueFillImage (	cl_command_queue command_queue,
+ // 	cl_mem image,
+ // 	const void *fill_color,
+ // 	const size_t *origin,
+ // 	const size_t *region,
+ // 	cl_uint num_events_in_wait_list,
+ // 	const cl_event *event_wait_list,
+ // 	cl_event *event)
+
     protected Pair<ByteBuffer, CLEvent> map(CLQueue queue, MapFlags flags,
             Pointer<SizeT> offset3, Pointer<SizeT> length3,
             Long imageRowPitch,
diff --git a/Core/src/main/velocity/com/nativelibs4java/opencl/CLImage2D.java b/Core/src/main/velocity/com/nativelibs4java/opencl/CLImage2D.java
@@ -56,6 +56,11 @@ public long getHeight() {
 		return infos.getIntOrLong(getEntity(), CL_IMAGE_HEIGHT);
 	}
 
+	@Override
+	protected long[] getDimensions() {
+		return new long[] { getWidth(), getHeight(), 1 };
+	}
+
 	/**
 #documentEventsToWaitForAndReturn()
 	 */
diff --git a/Core/src/main/velocity/com/nativelibs4java/opencl/CLImage3D.java b/Core/src/main/velocity/com/nativelibs4java/opencl/CLImage3D.java
@@ -39,6 +39,11 @@ public long getDepth() {
 		return infos.getIntOrLong(getEntity(), CL_IMAGE_DEPTH);
 	}
 
+	@Override
+	protected long[] getDimensions() {
+		return new long[] { getWidth(), getHeight(), getDepth() };
+	}
+
 	/**
 #documentEventsToWaitForAndReturn()
 	 */
diff --git a/Core/src/test/java/com/nativelibs4java/opencl/ImageTest.java b/Core/src/test/java/com/nativelibs4java/opencl/ImageTest.java
@@ -300,7 +300,7 @@ public void testRGBAImageSource() {
 	public void testShortGrayImageSource() {
             if (!supportsImages())
                 return;
-            try {
+            // try {
 			CLContext context = JavaCL.createBestContext();
             CLQueue queue = context.createDefaultQueue();
 			String src = "\n" +
@@ -391,8 +391,28 @@ public void testShortGrayImageSource() {
 			}
              *
              */
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
+        // } catch (Exception ex) {
+        //     ex.printStackTrace();
+        // }
 	}
-}
+
+    @Test
+    public void testFillImage() {
+        if (!supportsImages())
+            return;
+        int width = 256, height = 256;
+        CLImage2D clim = context.createImage2D(CLMem.Usage.InputOutput, CLImageFormat.INT_ARGB_FORMAT, width, height);
+
+        int red = 100, green = 110, blue = 120, alpha = 127;
+        int argb = alpha << 24 | red << 16 | green << 8 | blue;
+        CLEvent e = clim.fillImage(queue, new int[] { red, green, blue, alpha });
+        BufferedImage im = clim.read(queue, e);
+        //int[] rgb = im.getRGB(0, 0, width, height, null, 0, width);
+        for (int x = 0; x < width; x++) {
+        	for (int y = 0; y < height; y++) {
+                int pix = im.getRGB(x, y);
+        		assertEquals(argb, pix);
+        	}
+        }
+    }
+}
