From f129ec5b006062e7a63cd9afbb92057b8faaeef9 Mon Sep 17 00:00:00 2001 From: Michael Bien Date: Sun, 25 Apr 2010 14:27:17 +0200 Subject: implemented low level BuildProgramCallbacks. - removed userdata arguments from createContext* and buildProgram bindings - updated LowLevelBindingTest --- resources/clImplCustomCode.java | 44 +++++++++++++++-------------------------- 1 file changed, 16 insertions(+), 28 deletions(-) (limited to 'resources/clImplCustomCode.java') diff --git a/resources/clImplCustomCode.java b/resources/clImplCustomCode.java index 9edbd575..5ebf12aa 100644 --- a/resources/clImplCustomCode.java +++ b/resources/clImplCustomCode.java @@ -5,63 +5,48 @@ this.addressTable = addressTable; } - public long clCreateContext(PointerBuffer properties, PointerBuffer devices, CreateContextCallback pfn_notify, Object userData, IntBuffer errcode_ret) { + public long clCreateContext(PointerBuffer properties, PointerBuffer devices, CreateContextCallback pfn_notify, IntBuffer errcode_ret) { if(properties!=null && !properties.isDirect()) throw new RuntimeException("Argument \"properties\" was not a direct buffer"); if(pfn_notify != null) - throw new RuntimeException("asynchronous execution with callback is not yet implemented, pass null through this method to block until complete."); - - if(userData != null) - System.err.println("WARNING: userData not yet implemented... ignoring"); + throw new RuntimeException("asynchronous errorhandler are not supported yet, pass null through this method to block until complete."); return this.clCreateContext0( properties!=null?properties.getBuffer():null, Buffers.getDirectBufferByteOffset(properties), devices!=null?devices.remaining():0, devices!=null?devices.getBuffer():null, Buffers.getDirectBufferByteOffset(devices), - null, null, - errcode_ret, Buffers.getDirectBufferByteOffset(errcode_ret) ); + null, errcode_ret, Buffers.getDirectBufferByteOffset(errcode_ret) ); } - private native long clCreateContext0(Object cl_context_properties, int props_offset, int numDevices, Object devices, int devices_offset, CreateContextCallback pfn_notify, Object userData, Object errcode_ret, int err_offset); + private native long clCreateContext0(Object cl_context_properties, int props_offset, int numDevices, Object devices, int devices_offset, CreateContextCallback pfn_notify, Object errcode_ret, int err_offset); - public long clCreateContextFromType(PointerBuffer properties, long device_type, CreateContextCallback pfn_notify, Object userData, IntBuffer errcode_ret) { + public long clCreateContextFromType(PointerBuffer properties, long device_type, CreateContextCallback pfn_notify, IntBuffer errcode_ret) { if(properties!=null && !properties.isDirect()) throw new RuntimeException("Argument \"properties\" was not a direct buffer"); if(pfn_notify != null) - throw new RuntimeException("asynchronous execution with callback is not yet implemented, pass null through this method to block until complete."); - - if(userData != null) - System.err.println("WARNING: userData not yet implemented... ignoring"); + throw new RuntimeException("asynchronous errorhandler are not supported yet, pass null through this method to block until complete."); return this.clCreateContextFromType0( properties!=null?properties.getBuffer():null, Buffers.getDirectBufferByteOffset(properties), - device_type, pfn_notify, null, - errcode_ret, Buffers.getDirectBufferByteOffset(errcode_ret) ); + device_type, pfn_notify, errcode_ret, Buffers.getDirectBufferByteOffset(errcode_ret) ); } - private native long clCreateContextFromType0(Object properties, int props_offset, long device_type, CreateContextCallback pfn_notify, Object userData, Object errcode_ret, int err_offset); + private native long clCreateContextFromType0(Object properties, int props_offset, long device_type, CreateContextCallback pfn_notify, Object errcode_ret, int err_offset); /** Interface to C language function:
int32_t clBuildProgram(cl_program, uint32_t, cl_device_id * , const char * , void * ); */ - public int clBuildProgram(long program, int deviceCount, PointerBuffer deviceList, String options, BuildProgramCallback cb, Object userData) { + public int clBuildProgram(long program, int deviceCount, PointerBuffer deviceList, String options, BuildProgramCallback cb) { if(deviceList!=null && !deviceList.isDirect()) throw new RuntimeException("Argument \"properties\" was not a direct buffer"); - if(cb != null) - throw new RuntimeException("asynchronous execution with callback is not yet implemented, pass null through this method to block until complete."); - - if(userData != null) - System.err.println("WARNING: userData not yet implemented... ignoring"); - - return clBuildProgram0(program, deviceCount, - deviceList!=null?deviceList.getBuffer():null, Buffers.getDirectBufferByteOffset(deviceList), - options, cb, userData); + return clBuildProgram0(program, deviceCount, deviceList!=null?deviceList.getBuffer():null, + Buffers.getDirectBufferByteOffset(deviceList), options, cb); } /** Entry point to C language function: int32_t clBuildProgram(cl_program, uint32_t, cl_device_id * , const char * , void * ); */ - private native int clBuildProgram0(long program, int deviceCount, Object deviceList, int deviceListOffset, String options, BuildProgramCallback cb, Object userData); + private native int clBuildProgram0(long program, int deviceCount, Object deviceList, int deviceListOffset, String options, BuildProgramCallback cb); /** Interface to C language function:
void * {@native clEnqueueMapImage}(cl_command_queue command_queue, cl_mem image, uint32_t blocking_map, uint64_t map_flags, const size_t * , const size_t * , size_t * image_row_pitch, size_t * image_slice_pitch, uint32_t num_events_in_wait_list, cl_event * event_wait_list, cl_event * event, int32_t * errcode_ret); @@ -115,9 +100,12 @@ @param event_wait_list a direct {@link com.jogamp.gluegen.runtime.PointerBuffer} @param event a direct {@link com.jogamp.gluegen.runtime.PointerBuffer} @param errcode_ret a direct {@link java.nio.IntBuffer} */ - private native java.nio.ByteBuffer clEnqueueMapImage0(long command_queue, long image, int blocking_map, long map_flags, Object origin, int origin_byte_offset, Object range, int range_byte_offset, Object image_row_pitch, int image_row_pitch_byte_offset, Object image_slice_pitch, int image_slice_pitch_byte_offset, int num_events_in_wait_list, Object event_wait_list, int event_wait_list_byte_offset, Object event, int event_byte_offset, Object errcode_ret, int errcode_ret_byte_offset); + private native ByteBuffer clEnqueueMapImage0(long command_queue, long image, int blocking_map, long map_flags, Object origin, int origin_byte_offset, Object range, int range_byte_offset, Object image_row_pitch, int image_row_pitch_byte_offset, Object image_slice_pitch, int image_slice_pitch_byte_offset, int num_events_in_wait_list, Object event_wait_list, int event_wait_list_byte_offset, Object event, int event_byte_offset, Object errcode_ret, int errcode_ret_byte_offset); + /** + * Returns the extension function address for the given function name. + */ public long clGetExtensionFunctionAddress(String name) { ByteBuffer res = clGetExtensionFunctionAddressImpl(name); if(Platform.is32Bit()) { -- cgit v1.2.3