docs, docs, docs

jme3-core/src/main/java/com/jme3/opencl/CommandQueue.java

@@ -32,13 +32,33 @@
 package com.jme3.opencl;
 
 /**
- *
+ * Wrapper for an OpenCL command queue.
+ * The command queue serializes every GPU function call: By passing the same
+ * queue to OpenCL function (buffer, image operations, kernel calls), it is 
+ * ensured that they are executed in the order in which they are passed.
+ * <br>
+ * Each command queue is associtated with exactly one device: that device
+ * is specified on creation ({@link Context#createQueue(com.jme3.opencl.Device) })
+ * and all commands are sent to this device.
  * @author Sebastian Weiss
  */
 public interface CommandQueue extends OpenCLObject {
 
+    /**
+     * Issues all previously queued OpenCL commands in command_queue to the
+     * device associated with command queue. Flush only guarantees that all
+     * queued commands to command_queue will eventually be submitted to the
+     * appropriate device. There is no guarantee that they will be complete
+     * after flush returns.
+     */
     void flush();
 
+    /**
+     * Blocks until all previously queued OpenCL commands in command queue are
+     * issued to the associated device and have completed. Finish does not
+     * return until all previously queued commands in command queue have been
+     * processed and completed. Finish is also a synchronization point.
+     */
     void finish();
 
 }

jme3-core/src/main/java/com/jme3/opencl/Context.java

@@ -50,44 +50,216 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
- * The central OpenCL context. Every actions start from here.
+ * The central OpenCL context. Every action starts from here.
- *
+ * The context can be obtained by {@link com.jme3.system.JmeContext#getOpenCLContext() }.
+ * <p>
+ * The context is used to:
+ * <ul>
+ *  <li>Query the available devices</li>
+ *  <li>Create a command queue</li>
+ *  <li>Create buffers and images</li>
+ *  <li>Created buffers and images shared with OpenGL vertex buffers, textures and renderbuffers</li>
+ *  <li>Create program objects from source code and source files</li>
+ * </ul>
  * @author Sebastian Weiss
  */
 public abstract class Context implements OpenCLObject {
     private static final Logger LOG = Logger.getLogger(Context.class.getName());
 
+    /**
+     * Returns all available devices for this context.
+     * These devices all belong to the same {@link Platform}.
+     * They are used to create a command queue sending commands to a particular
+     * device, see {@link #createQueue(com.jme3.opencl.Device) }.
+     * Also, device capabilities, like the supported OpenCL version, extensions,
+     * memory size and so on, are queried over the Device instances.
+     * <br>
+     * The available devices were specified by a {@link PlatformChooser}.
+     * @return 
+     */
     public abstract List<? extends Device> getDevices();
 
+    /**
+     * Alternative version of {@link #createQueue(com.jme3.opencl.Device) },
+     * just uses the first device returned by {@link #getDevices() }.
+     * @return the command queue
+     */
     public CommandQueue createQueue() {
         return createQueue(getDevices().get(0));
     }
+    /**
+     * Creates a command queue sending commands to the specified device.
+     * The device must be an entry of {@link #getDevices() }.
+     * @param device the target device
+     * @return the command queue
+     */
 	public abstract CommandQueue createQueue(Device device);
 
+    /**
+     * Allocates a new buffer of the specific size and access type on the device.
+     * @param size the size of the buffer in bytes
+     * @param access the allowed access of this buffer from kernel code
+     * @return the new buffer
+     */
     public abstract Buffer createBuffer(long size, MemoryAccess access);
+    /**
+     * Alternative version of {@link #createBuffer(long, com.jme3.opencl.MemoryAccess) },
+     * creates a buffer with read and write access.
+     * @param size the size of the buffer in bytes
+     * @return the new buffer
+     */
     public Buffer createBuffer(long size) {
         return createBuffer(size, MemoryAccess.READ_WRITE);
     }
 
+    /**
+     * Creates a new buffer wrapping the specific host memory. This host memory
+     * specified by a ByteBuffer can then be used directly by kernel code,
+     * although the access might be slower than with native buffers
+     * created by {@link #createBuffer(long, com.jme3.opencl.MemoryAccess) }.
+     * @param data the host buffer to use
+     * @param access the allowed access of this buffer from kernel code
+     * @return the new buffer
+     */
     public abstract Buffer createBufferFromHost(ByteBuffer data, MemoryAccess access);
+    /**
+     * Alternative version of {@link #createBufferFromHost(java.nio.ByteBuffer, com.jme3.opencl.MemoryAccess) },
+     * creates a buffer with read and write access.
+     * @param data the host buffer to use
+     * @return the new buffer
+     */
     public Buffer createBufferFromHost(ByteBuffer data) {
         return createBufferFromHost(data, MemoryAccess.READ_WRITE);
     }
 
-    public abstract Image createImage(MemoryAccess access, ImageFormat format, ImageDescriptor descr, ByteBuffer hostPtr);
+    /**
+     * Creates a new 1D, 2D, 3D image.<br>
+     * {@code ImageFormat} specifies the element type and order, like RGBA of floats.<br>
+     * {@code ImageDescriptor} specifies the dimension of the image.<br>
+     * Furthermore, a ByteBuffer can be specified in the ImageDescriptor together
+     * with row and slice pitches. This buffer is then used to store the image.
+     * If no ByteBuffer is specified, a new buffer is allocated (this is the
+     * normal behaviour).
+     * @param access the allowed access of this image from kernel code
+     * @param format the image format
+     * @param descr the image descriptor
+     * @return the new image object
+     */
+    public abstract Image createImage(MemoryAccess access, ImageFormat format, ImageDescriptor descr);
 	//TODO: add simplified methods for 1D, 2D, 3D textures
+    
+    /**
+     * Queries all supported image formats for a specified memory access and
+     * image type.
+     * <br>
+     * Note that the returned array may contain {@code ImageFormat} objects
+     * where {@code ImageChannelType} or {@code ImageChannelOrder} are {@code null}
+     * (or both). This is the case when the device supports new formats that
+     * are not included in this wrapper yet.
+     * @param access the memory access type
+     * @param type the image type (1D, 2D, 3D, ...)
+     * @return an array of all supported image formats
+     */
     public abstract ImageFormat[] querySupportedFormats(MemoryAccess access, ImageType type);
     
 	//Interop
+    /**
+     * Creates a shared buffer from a VertexBuffer. 
+     * The returned buffer and the vertex buffer operate on the same memory, 
+     * changes in one view are visible in the other view.
+     * This can be used to modify meshes directly from OpenCL (e.g. for particle systems).
+     * <br>
+     * <b>Note:</b> The vertex buffer must already been uploaded to the GPU,
+     * i.e. it must be used at least once for drawing.
+     * <p>
+     * Before the returned buffer can be used, it must be acquried explicitly
+     * by {@link Buffer#acquireBufferForSharingAsync(com.jme3.opencl.CommandQueue) }
+     * and after modifying it, released by {@link Buffer#releaseBufferForSharingAsync(com.jme3.opencl.CommandQueue) }.
+     * This is needed so that OpenGL and OpenCL operations do not interfer with each other.
+     * @param vb the vertex buffer to share
+     * @param access the memory access for the kernel
+     * @return the new buffer
+     */
     public abstract Buffer bindVertexBuffer(VertexBuffer vb, MemoryAccess access);
 
+    /**
+     * Creates a shared image object from a jME3-image.
+     * The returned image shares the same memory with the jME3-image, changes
+     * in one view are visible in the other view.
+     * This can be used to modify textures and images directly from OpenCL
+     * (e.g. for post processing effects and other texture effects).
+     * <br>
+     * <b>Note:</b> The image must already been uploaded to the GPU,
+     * i.e. it must be used at least once for drawing.
+     * <p>
+     * Before the returned image can be used, it must be acquried explicitly
+     * by {@link Image#acquireImageForSharingAsync(com.jme3.opencl.CommandQueue) }
+     * and after modifying it, released by {@link Image#releaseImageForSharingAsync(com.jme3.opencl.CommandQueue) }
+     * This is needed so that OpenGL and OpenCL operations do not interfer with each other.
+     * 
+     * @param image the jME3 image object
+     * @param textureType the texture type (1D, 2D, 3D), since this is not stored in the image
+     * @param miplevel the mipmap level that should be shared
+     * @param access the allowed memory access for kernels
+     * @return the OpenCL image
+     */
     public abstract Image bindImage(com.jme3.texture.Image image, Texture.Type textureType, int miplevel, MemoryAccess access);
+    /**
+     * Creates a shared image object from a jME3 texture.
+     * The returned image shares the same memory with the jME3 texture, changes
+     * in one view are visible in the other view.
+     * This can be used to modify textures and images directly from OpenCL
+     * (e.g. for post processing effects and other texture effects).
+     * <br>
+     * <b>Note:</b> The image must already been uploaded to the GPU,
+     * i.e. it must be used at least once for drawing.
+     * <p>
+     * Before the returned image can be used, it must be acquried explicitly
+     * by {@link Image#acquireImageForSharingAsync(com.jme3.opencl.CommandQueue) }
+     * and after modifying it, released by {@link Image#releaseImageForSharingAsync(com.jme3.opencl.CommandQueue) }
+     * This is needed so that OpenGL and OpenCL operations do not interfer with each other.
+     * <p>
+     * This method is equivalent to calling
+     * {@code bindImage(texture.getImage(), texture.getType(), miplevel, access)}.
+     * 
+     * @param texture the jME3 texture
+     * @param miplevel the mipmap level that should be shared
+     * @param access the allowed memory access for kernels
+     * @return the OpenCL image
+     */
     public Image bindImage(Texture texture, int miplevel, MemoryAccess access) {
         return bindImage(texture.getImage(), texture.getType(), miplevel, access);
     }
+    /**
+     * Alternative version to {@link #bindImage(com.jme3.texture.Texture, int, com.jme3.opencl.MemoryAccess) },
+     * uses {@code miplevel=0}. 
+     * @param texture the jME3 texture
+     * @param access the allowed memory access for kernels
+     * @return the OpenCL image
+     */
     public Image bindImage(Texture texture, MemoryAccess access) {
         return bindImage(texture, 0, access);
     }
+    /**
+     * Creates a shared image object from a jME3 render buffer.
+     * The returned image shares the same memory with the jME3 render buffer, changes
+     * in one view are visible in the other view.
+     * <br>
+     * This can be used as an alternative to post processing effects
+     * (e.g. reduce sum operations, needed e.g. for tone mapping).
+     * <br>
+     * <b>Note:</b> The renderbuffer must already been uploaded to the GPU,
+     * i.e. it must be used at least once for drawing.
+     * <p>
+     * Before the returned image can be used, it must be acquried explicitly
+     * by {@link Image#acquireImageForSharingAsync(com.jme3.opencl.CommandQueue) }
+     * and after modifying it, released by {@link Image#releaseImageForSharingAsync(com.jme3.opencl.CommandQueue) }
+     * This is needed so that OpenGL and OpenCL operations do not interfer with each other.
+     * 
+     * @param buffer
+     * @param access
+     * @return 
+     */
     public Image bindRenderBuffer(FrameBuffer.RenderBuffer buffer, MemoryAccess access) {
         if (buffer.getTexture() == null) {
             return bindPureRenderBuffer(buffer, access);
@@ -97,12 +269,61 @@ public abstract class Context implements OpenCLObject {
     }
     protected abstract Image bindPureRenderBuffer(FrameBuffer.RenderBuffer buffer, MemoryAccess access);
 
+    /**
+     * Creates a program object from the provided source code.
+     * The program still needs to be compiled using {@link Program#build() }.
+     * 
+     * @param sourceCode the source code
+     * @return the program object
+     */
     public abstract Program createProgramFromSourceCode(String sourceCode);
     
+    /**
+     * Creates a program object from the provided source code and files.
+     * The source code is made up from the specified include string first, 
+     * then all files specified by the resource array (array of asset paths)
+     * are loaded by the provided asset manager and appended to the source code.
+     * <p>
+     * The typical use case is:
+     * <ul>
+     *  <li>The include string contains some compiler constants like the grid size </li>
+     *  <li>Some common OpenCL files used as libraries (Convention: file names end with {@code .clh}</li>
+     *  <li>One main OpenCL file containing the actual kernels (Convention: file name ends with {@code .cl})</li>
+     * </ul>
+     * Note: Files that can't be loaded are skipped.<br>
+     * 
+     * The actual creation is handled by {@link #createProgramFromSourceCode(java.lang.String) }.
+     * 
+     * @param assetManager the asset manager used to load the files
+     * @param include an additional include string
+     * @param resources an array of asset paths pointing to OpenCL source files
+     * @return the new program objects
+     */
     public Program createProgramFromSourceFilesWithInclude(AssetManager assetManager, String include, String... resources) {
         return createProgramFromSourceFilesWithInclude(assetManager, include, Arrays.asList(resources));
     }
 
+    /**
+     * Creates a program object from the provided source code and files.
+     * The source code is made up from the specified include string first, 
+     * then all files specified by the resource array (array of asset paths)
+     * are loaded by the provided asset manager and appended to the source code.
+     * <p>
+     * The typical use case is:
+     * <ul>
+     *  <li>The include string contains some compiler constants like the grid size </li>
+     *  <li>Some common OpenCL files used as libraries (Convention: file names end with {@code .clh}</li>
+     *  <li>One main OpenCL file containing the actual kernels (Convention: file name ends with {@code .cl})</li>
+     * </ul>
+     * Note: Files that can't be loaded are skipped.<br>
+     * 
+     * The actual creation is handled by {@link #createProgramFromSourceCode(java.lang.String) }.
+     * 
+     * @param assetManager the asset manager used to load the files
+     * @param include an additional include string
+     * @param resources an array of asset paths pointing to OpenCL source files
+     * @return the new program objects
+     */
     public Program createProgramFromSourceFilesWithInclude(AssetManager assetManager, String include, List<String> resources) {
         StringBuilder str = new StringBuilder();
         str.append(include);
@@ -127,10 +348,18 @@ public abstract class Context implements OpenCLObject {
         return createProgramFromSourceCode(str.toString());
     }
 
+    /**
+     * Alternative version of {@link #createProgramFromSourceFilesWithInclude(com.jme3.asset.AssetManager, java.lang.String, java.lang.String...) }
+     * with an empty include string
+     */
     public Program createProgramFromSourceFiles(AssetManager assetManager, String... resources) {
         return createProgramFromSourceFilesWithInclude(assetManager, "", resources);
     }
 
+    /**
+     * Alternative version of {@link #createProgramFromSourceFilesWithInclude(com.jme3.asset.AssetManager, java.lang.String, java.util.List) }
+     * with an empty include string
+     */
     public Program createProgramFromSourceFiles(AssetManager assetManager, List<String> resources) {
         return createProgramFromSourceFilesWithInclude(assetManager, "", resources);
     }

jme3-core/src/main/java/com/jme3/opencl/Device.java

@@ -34,13 +34,26 @@ package com.jme3.opencl;
 import java.util.Collection;
 
 /**
- *
+ * Represents a hardware device actually running the OpenCL kernels.
+ * A {@link Context} can be accociated with multiple {@code Devices}
+ * that all belong to the same {@link Platform}.
+ * For execution, a single device must be chosen and passed to a command
+ * queue ({@link Context#createQueue(com.jme3.opencl.Device) }).
+ * <p>
+ * This class is used to query the capabilities of the underlying device.
+ * 
  * @author Sebastian Weiss
  */
 public interface Device {
 	
+    /**
+     * @return the platform accociated with this device
+     */
     Platform getPlatform();
     
+    /**
+     * The device type
+     */
 	public static enum DeviceType {
 		DEFAULT,
 		CPU,
@@ -48,55 +61,251 @@ public interface Device {
 		ACCELEARTOR,
 		ALL
 	}
+    /**
+     * @return queries the device type
+     */
 	DeviceType getDeviceType();
+    /**
+     * @return the vendor id
+     */
 	int getVendorId();
+    /**
+     * checks if this device is available at all, must always be tested
+     * @return checks if this device is available at all, must always be tested
+     */
 	boolean isAvailable();
 	
+    /**
+     * @return if this device has a compiler for kernel code
+     */
 	boolean hasCompiler();
+    /**
+     * @return supports double precision floats (64 bit)
+     */
 	boolean hasDouble();
+    /**
+     * @return supports half precision floats (16 bit)
+     */
 	boolean hasHalfFloat();
+    /**
+     * @return supports error correction for every access to global or constant memory
+     */
 	boolean hasErrorCorrectingMemory();
+    /**
+     * @return supports unified virtual memory (OpenCL 2.0)
+     */
 	boolean hasUnifiedMemory();
+    /**
+     * @return supports images
+     */
 	boolean hasImageSupport();
+    /**
+     * @return supports writes to 3d images (this is an extension)
+     */
     boolean hasWritableImage3D();
+    /**
+     * @return supports sharing with OpenGL
+     */
     boolean hasOpenGLInterop();
+    /**
+     * Explicetly tests for the availability of the specified extension
+     * @param extension the name of the extension
+     * @return {@code true} iff this extension is supported
+     */
 	boolean hasExtension(String extension);
+    /**
+     * Lists all available extensions
+     * @return all available extensions
+     */
 	Collection<? extends String> getExtensions();
 	
+    /**
+     * Returns the number of parallel compute units on
+     * the OpenCL device. A work-group
+     * executes on a single compute unit. The
+     * minimum value is 1.
+     * @return the number of parallel compute units
+     * @see #getMaximumWorkItemDimensions() 
+     * @see #getMaximumWorkItemSizes() 
+     */
 	int getComputeUnits();
+    /**
+     * @return maximum clock frequency of the device in MHz
+     */
 	int getClockFrequency();
+    /**
+     * Returns the default compute device address space
+     * size specified as an unsigned integer value
+     * in bits. Currently supported values are 32
+     * or 64 bits.
+     * @return the size of an adress
+     */
 	int getAddressBits();
+    /**
+     * @return {@code true} if this device is little endian
+     */
 	boolean isLittleEndian();
 	
+    /**
+     * The maximum dimension that specify the local and global work item ids.
+     * You can always assume to be this at least 3.
+     * Therefore, the ids are always three integers x,y,z.
+     * @return the maximum dimension of work item ids
+     */
 	long getMaximumWorkItemDimensions();
+    /**
+     * Maximum number of work-items that can be specified in each dimension of the
+     * work-group to {@link Kernel#Run2(com.jme3.opencl.CommandQueue, com.jme3.opencl.WorkSize, com.jme3.opencl.WorkSize, java.lang.Object...) }.
+     * The array has a length of at least 3.
+     * @return the maximum size of the work group in each dimension
+     */
 	long[] getMaximumWorkItemSizes();
+    /**
+     * Maximum number of work-items in a
+     * work-group executing a kernel on a single
+     * compute unit, using the data parallel
+     * execution model.
+     * @return maximum number of work-items in a work-group
+     */
 	long getMaxiumWorkItemsPerGroup();
 	
+    /**
+     * @return the maximum number of samples that can be used in a kernel
+     */
 	int getMaximumSamplers();
+    /**
+     * @return the maximum number of images that can be used for reading in a kernel
+     */
 	int getMaximumReadImages();
+    /**
+     * @return the maximum number of images that can be used for writing in a kernel
+     */
 	int getMaximumWriteImages();
+    /**
+     * Queries the maximal size of a 2D image
+     * @return an array of length 2 with the maximal size of a 2D image
+     */
 	long[] getMaximumImage2DSize();
+    /**
+     * Queries the maximal size of a 3D image
+     * @return an array of length 3 with the maximal size of a 3D image
+     */
 	long[] getMaximumImage3DSize();
 	
+    /**
+     * @return the maximal size of a memory object (buffer and image) in bytes
+     */
     long getMaximumAllocationSize();
+    /**
+     * @return the total available global memory in bytes
+     */
     long getGlobalMemorySize();
+    /**
+     * @return the total available local memory in bytes
+     */
     long getLocalMemorySize();
+    /**
+     * Returns the maximal size of a constant buffer.
+     * <br>
+     * Constant buffers are normal buffer objects, but passed to the kernel
+     * with the special declaration {@code __constant BUFFER_TYPE* BUFFER_NAME}.
+     * Because they have a special caching, their size is usually very limited.
+     * 
+     * @return the maximal size of a constant buffer
+     */
     long getMaximumConstantBufferSize();
+    /**
+     * @return the maximal number of constant buffer arguments in a kernel call
+     */
     int getMaximumConstantArguments();
     
 	//TODO: cache, prefered sizes properties
-	
+    /**
+     * OpenCL profile string. Returns the profile name supported by the device.
+     * The profile name returned can be one of the following strings:<br>
+     * FULL_PROFILE – if the device supports the OpenCL specification
+     * (functionality defined as part of the core specification and does not
+     * require any extensions to be supported).<br>
+     * EMBEDDED_PROFILE - if the device supports the OpenCL embedded profile.
+     *
+     * @return the profile string
+     */
 	String getProfile();
+    /**
+     * OpenCL version string. Returns the OpenCL version supported by the
+     * device. This version string has the following format: OpenCL space
+     * major_version.minor_version space vendor-specific information.
+     * <br>
+     * E.g. OpenCL 1.1, OpenCL 1.2, OpenCL 2.0
+     *
+     * @return the version string
+     */
 	String getVersion();
+    /**
+     * Extracts the major version from the version string
+     * @return the major version
+     * @see #getVersion() 
+     */
 	int getVersionMajor();
+    /**
+     * Extracts the minor version from the version string
+     * @return the minor version
+     * @see #getVersion() }
+     */
 	int getVersionMinor();
+    
+    /**
+     * OpenCL C version string. Returns the highest OpenCL C version supported
+     * by the compiler for this device that is not of type
+     * CL_DEVICE_TYPE_CUSTOM. This version string has the following format:
+     * OpenCL space C space major_version.minor_version space vendor-specific
+     * information.<br>
+     * The major_version.minor_version value returned must be 1.2 if
+     * CL_DEVICE_VERSION is OpenCL 1.2. The major_version.minor_version value
+     * returned must be 1.1 if CL_DEVICE_VERSION is OpenCL 1.1. The
+     * major_version.minor_version value returned can be 1.0 or 1.1 if
+     * CL_DEVICE_VERSION is OpenCL 1.0.
+     *
+     * @return the compiler version
+     */
 	String getCompilerVersion();
+    /**
+     * Extracts the major version from the compiler version
+     * @return the major compiler version
+     * @see #getCompilerVersion() 
+     */
 	int getCompilerVersionMajor();
+    /**
+     * Extracts the minor version from the compiler version
+     * @return the minor compiler version
+     * @see #getCompilerVersion() 
+     */
 	int getCompilerVersionMinor();
+    /**     
+     * @return the OpenCL software driver version string in the form
+     * major_number.minor_number
+     */
 	String getDriverVersion();
+    /**
+     * Extracts the major version from the driver version
+     * @return the major driver version
+     * @see #getDriverVersion() 
+     */
 	int getDriverVersionMajor();
+    /**
+     * Extracts the minor version from the driver version
+     * @return the minor driver version
+     * @see #getDriverVersion() 
+     */
 	int getDriverVersionMinor();
+    
+    /**
+     * @return the device name
+     */
 	String getName();
+    /**
+     * @return the vendor
+     */
 	String getVendor();
 
 }

jme3-core/src/main/java/com/jme3/opencl/Image.java

@@ -131,6 +131,7 @@ public interface Image extends OpenCLObject {
         public long arraySize;
         public long rowPitch;
         public long slicePitch;
+        public ByteBuffer hostPtr;
         /*
         public int numMipLevels;  //They must always be set to zero
         public int numSamples;
@@ -139,7 +140,7 @@ public interface Image extends OpenCLObject {
         public ImageDescriptor() {
         }
 
-        public ImageDescriptor(ImageType type, long width, long height, long depth, long arraySize, long rowPitch, long slicePitch) {
+        public ImageDescriptor(ImageType type, long width, long height, long depth, long arraySize, long rowPitch, long slicePitch, ByteBuffer hostPtr) {
             this.type = type;
             this.width = width;
             this.height = height;
@@ -147,6 +148,7 @@ public interface Image extends OpenCLObject {
             this.arraySize = arraySize;
             this.rowPitch = rowPitch;
             this.slicePitch = slicePitch;
+            this.hostPtr = hostPtr;
         }
         public ImageDescriptor(ImageType type, long width, long height, long depth, long arraySize) {
             this.type = type;
@@ -156,6 +158,7 @@ public interface Image extends OpenCLObject {
             this.arraySize = arraySize;
             this.rowPitch = 0;
             this.slicePitch = 0;
+            hostPtr = null;
         }
 
         @Override

jme3-examples/src/main/java/jme3test/opencl/HelloOpenCL.java

@@ -174,10 +174,6 @@ public class HelloOpenCL extends SimpleApplication {
             String include = "#define TYPE float\n";
             Program program = clContext.createProgramFromSourceFilesWithInclude(assetManager, include, "jme3test/opencl/Blas.cl");
             program.build();
-            Kernel[] kernels = program.createAllKernels();
-            for (Kernel k : kernels) {
-                System.out.println("available kernel: "+k.getName());
-            }
             Kernel kernel = program.createKernel("Fill");
             System.out.println("number of args: "+kernel.getArgCount());
 
@@ -218,8 +214,8 @@ public class HelloOpenCL extends SimpleApplication {
             
             //create an image
             Image.ImageFormat format = new Image.ImageFormat(Image.ImageChannelOrder.RGBA, Image.ImageChannelType.FLOAT);
-            Image.ImageDescriptor descr = new Image.ImageDescriptor(Image.ImageType.IMAGE_2D, 1920, 1080, 0, 0, 0, 0);
+            Image.ImageDescriptor descr = new Image.ImageDescriptor(Image.ImageType.IMAGE_2D, 1920, 1080, 0, 0);
-            Image image = clContext.createImage(MemoryAccess.READ_WRITE, format, descr, null);
+            Image image = clContext.createImage(MemoryAccess.READ_WRITE, format, descr);
             System.out.println("image created");
             
             //check queries
@@ -258,8 +254,8 @@ public class HelloOpenCL extends SimpleApplication {
             
             //create a second image
             format = new Image.ImageFormat(Image.ImageChannelOrder.RGBA, Image.ImageChannelType.FLOAT);
-            descr = new Image.ImageDescriptor(Image.ImageType.IMAGE_2D, 512, 512, 0, 0, 0, 0);
+            descr = new Image.ImageDescriptor(Image.ImageType.IMAGE_2D, 512, 512, 0, 0);
-            Image image2 = clContext.createImage(MemoryAccess.READ_WRITE, format, descr, null);
+            Image image2 = clContext.createImage(MemoryAccess.READ_WRITE, format, descr);
             //copy an area of image1 to image2
             image.copyTo(clQueue, image2, new long[]{1000, 20,0}, new long[]{0,0,0}, new long[]{512, 512,1});
             //this area should be completely blue

jme3-lwjgl/src/main/java/com/jme3/opencl/lwjgl/LwjglContext.java

@@ -100,7 +100,7 @@ public class LwjglContext extends Context {
     }
 
     @Override
-    public Image createImage(MemoryAccess access, ImageFormat format, ImageDescriptor descr, ByteBuffer hostPtr) {
+    public Image createImage(MemoryAccess access, ImageFormat format, ImageDescriptor descr) {
         long memFlags = Utils.getMemoryAccessFlags(access);
         Utils.errorBuffer.rewind();
         //fill image format
@@ -116,7 +116,7 @@ public class LwjglContext extends Context {
                 .put(0).put(0).put(0);
         Utils.b80.rewind();
         //create image
-        CLMem mem = CL12.clCreateImage(context, memFlags, Utils.tempBuffers[0].b16, Utils.b80, hostPtr, Utils.errorBuffer);
+        CLMem mem = CL12.clCreateImage(context, memFlags, Utils.tempBuffers[0].b16, Utils.b80, descr.hostPtr, Utils.errorBuffer);
         Utils.checkError(Utils.errorBuffer, "clCreateImage");
         return new LwjglImage(mem);
     }