diff options
author | Michael Bien <[email protected]> | 2010-03-27 02:49:28 +0100 |
---|---|---|
committer | Michael Bien <[email protected]> | 2010-03-27 02:49:28 +0100 |
commit | 043f1cf8bcdfc8f8faa853c92afc064c468dc2a8 (patch) | |
tree | a4d2d6d16ab105293d104d63db72b5282502942e | |
parent | 7254e22512ab61f3e2ed3fcf3622ef55b9af0aa7 (diff) |
refactoring due to gluegen changes.
- renamed com.sun.gluegen.runtime -> com.jogamp.gluegen.runtime.
22 files changed, 49 insertions, 49 deletions
diff --git a/resources/cl-if.cfg b/resources/cl-if.cfg index feb96399..47761b38 100644 --- a/resources/cl-if.cfg +++ b/resources/cl-if.cfg @@ -20,17 +20,17 @@ Ignore CL_GL_.*|cl.*GL.* Ignore clCreateContext CustomJavaCode CL CustomJavaCode CL /** Interface to C language function: <br> <code> cl_context {@native clCreateContext}(intptr_t * , uint32_t, cl_device_id * , void (*pfn_notify)(const char *, const void *, size_t, void *), void *, int32_t * ); </code> */ -CustomJavaCode CL public long clCreateContext(com.sun.gluegen.runtime.PointerBuffer properties, com.sun.gluegen.runtime.PointerBuffer devices, CreateContextCallback pfn_notify, Object userData, IntBuffer errcode_ret); +CustomJavaCode CL public long clCreateContext(com.jogamp.gluegen.runtime.PointerBuffer properties, com.jogamp.gluegen.runtime.PointerBuffer devices, CreateContextCallback pfn_notify, Object userData, IntBuffer errcode_ret); Ignore clCreateContextFromType CustomJavaCode CL CustomJavaCode CL /** Interface to C language function: <br> <code> cl_context {@native clCreateContextFromType}(cl_context_properties *properties, cl_device_type device_type, void (*pfn_notify)(const char *errinfo, const void *private_info, size_t cb, void *user_data), void *user_data, cl_int *errcode_ret) ; </code> */ -CustomJavaCode CL public long clCreateContextFromType(com.sun.gluegen.runtime.PointerBuffer properties, long device_type, CreateContextCallback pfn_notify, Object userData, IntBuffer errcode_ret); +CustomJavaCode CL public long clCreateContextFromType(com.jogamp.gluegen.runtime.PointerBuffer properties, long device_type, CreateContextCallback pfn_notify, Object userData, IntBuffer errcode_ret); Ignore clBuildProgram CustomJavaCode CL CustomJavaCode CL /** Interface to C language function: <br> <code> int32_t {@native clBuildProgram}(cl_program, uint32_t, cl_device_id * , const char * , void (*pfn_notify)(cl_program, void *user_data), void * ); </code> */ -CustomJavaCode CL public int clBuildProgram(long program, int deviceCount, com.sun.gluegen.runtime.PointerBuffer devices, String options, BuildProgramCallback cb, Object userData); +CustomJavaCode CL public int clBuildProgram(long program, int deviceCount, com.jogamp.gluegen.runtime.PointerBuffer devices, String options, BuildProgramCallback cb, Object userData); Ignore clEnqueueNativeKernel #TODO.. diff --git a/resources/clImplCustomCode.c b/resources/clImplCustomCode.c index 05a29552..747e2c85 100644 --- a/resources/clImplCustomCode.c +++ b/resources/clImplCustomCode.c @@ -125,7 +125,7 @@ Java_com_mbien_opencl_impl_CLImpl_clBuildProgram0(JNIEnv *env, jobject _unused, /* Java->C glue code: * Java package: com.mbien.opencl.impl.CLImpl - * Java method: java.nio.ByteBuffer clEnqueueMapImage(long command_queue, long image, int blocking_map, long map_flags, com.sun.gluegen.runtime.PointerBuffer origin, com.sun.gluegen.runtime.PointerBuffer range, com.sun.gluegen.runtime.PointerBuffer image_row_pitch, com.sun.gluegen.runtime.PointerBuffer image_slice_pitch, int num_events_in_wait_list, com.sun.gluegen.runtime.PointerBuffer event_wait_list, com.sun.gluegen.runtime.PointerBuffer event, java.nio.IntBuffer errcode_ret) + * Java method: java.nio.ByteBuffer clEnqueueMapImage(long command_queue, long image, int blocking_map, long map_flags, com.jogamp.gluegen.runtime.PointerBuffer origin, com.jogamp.gluegen.runtime.PointerBuffer range, com.jogamp.gluegen.runtime.PointerBuffer image_row_pitch, com.jogamp.gluegen.runtime.PointerBuffer image_slice_pitch, int num_events_in_wait_list, com.jogamp.gluegen.runtime.PointerBuffer event_wait_list, com.jogamp.gluegen.runtime.PointerBuffer event, java.nio.IntBuffer errcode_ret) * C function: void * 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); */ JNIEXPORT jobject JNICALL diff --git a/resources/clImplCustomCode.java b/resources/clImplCustomCode.java index a9576444..c4d9c845 100644 --- a/resources/clImplCustomCode.java +++ b/resources/clImplCustomCode.java @@ -65,18 +65,18 @@ /** Interface to C language function: <br> <code> 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); </code> - @param origin a direct {@link com.sun.gluegen.runtime.PointerBuffer} - @param range a direct {@link com.sun.gluegen.runtime.PointerBuffer} - @param image_row_pitch a direct {@link com.sun.gluegen.runtime.PointerBuffer} - @param image_slice_pitch a direct {@link com.sun.gluegen.runtime.PointerBuffer} - @param event_wait_list a direct {@link com.sun.gluegen.runtime.PointerBuffer} - @param event a direct {@link com.sun.gluegen.runtime.PointerBuffer} + @param origin a direct {@link com.jogamp.gluegen.runtime.PointerBuffer} + @param range a direct {@link com.jogamp.gluegen.runtime.PointerBuffer} + @param image_row_pitch a direct {@link com.jogamp.gluegen.runtime.PointerBuffer} + @param image_slice_pitch a direct {@link com.jogamp.gluegen.runtime.PointerBuffer} + @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} */ public java.nio.ByteBuffer clEnqueueMapImage(long command_queue, long image, int blocking_map, long map_flags, - com.sun.gluegen.runtime.PointerBuffer origin, com.sun.gluegen.runtime.PointerBuffer range, - com.sun.gluegen.runtime.PointerBuffer image_row_pitch, com.sun.gluegen.runtime.PointerBuffer image_slice_pitch, + com.jogamp.gluegen.runtime.PointerBuffer origin, com.jogamp.gluegen.runtime.PointerBuffer range, + com.jogamp.gluegen.runtime.PointerBuffer image_row_pitch, com.jogamp.gluegen.runtime.PointerBuffer image_slice_pitch, int num_events_in_wait_list, - com.sun.gluegen.runtime.PointerBuffer event_wait_list, com.sun.gluegen.runtime.PointerBuffer event, java.nio.IntBuffer errcode_ret) { + com.jogamp.gluegen.runtime.PointerBuffer event_wait_list, com.jogamp.gluegen.runtime.PointerBuffer event, java.nio.IntBuffer errcode_ret) { if (!BufferFactory.isDirect(origin)) throw new CLException("Argument \"origin\" was not a direct buffer"); @@ -108,12 +108,12 @@ } /** Entry point to C language function: <code> 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); </code> - @param origin a direct {@link com.sun.gluegen.runtime.PointerBuffer} - @param range a direct {@link com.sun.gluegen.runtime.PointerBuffer} - @param image_row_pitch a direct {@link com.sun.gluegen.runtime.PointerBuffer} - @param image_slice_pitch a direct {@link com.sun.gluegen.runtime.PointerBuffer} - @param event_wait_list a direct {@link com.sun.gluegen.runtime.PointerBuffer} - @param event a direct {@link com.sun.gluegen.runtime.PointerBuffer} + @param origin a direct {@link com.jogamp.gluegen.runtime.PointerBuffer} + @param range a direct {@link com.jogamp.gluegen.runtime.PointerBuffer} + @param image_row_pitch a direct {@link com.jogamp.gluegen.runtime.PointerBuffer} + @param image_slice_pitch a direct {@link com.jogamp.gluegen.runtime.PointerBuffer} + @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); diff --git a/src/com/mbien/opencl/CLCommandQueue.java b/src/com/mbien/opencl/CLCommandQueue.java index fe5e2965..aca7cf6f 100644 --- a/src/com/mbien/opencl/CLCommandQueue.java +++ b/src/com/mbien/opencl/CLCommandQueue.java @@ -1,7 +1,7 @@ package com.mbien.opencl; import com.mbien.opencl.gl.CLGLI; -import com.sun.gluegen.runtime.PointerBuffer; +import com.jogamp.gluegen.runtime.PointerBuffer; import java.nio.ByteBuffer; import java.nio.IntBuffer; import java.util.ArrayList; diff --git a/src/com/mbien/opencl/CLContext.java b/src/com/mbien/opencl/CLContext.java index bac542c0..0d9e1d90 100644 --- a/src/com/mbien/opencl/CLContext.java +++ b/src/com/mbien/opencl/CLContext.java @@ -4,9 +4,9 @@ import com.mbien.opencl.CLDevice.Type; import com.mbien.opencl.CLMemory.Mem; import com.mbien.opencl.CLSampler.AddressingMode; import com.mbien.opencl.CLSampler.FilteringMode; -import com.sun.gluegen.runtime.BufferFactory; -import com.sun.gluegen.runtime.CPU; -import com.sun.gluegen.runtime.PointerBuffer; +import com.jogamp.gluegen.runtime.BufferFactory; +import com.jogamp.gluegen.runtime.CPU; +import com.jogamp.gluegen.runtime.PointerBuffer; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; @@ -26,7 +26,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import static com.mbien.opencl.CLException.*; -import static com.sun.gluegen.runtime.BufferFactory.*; +import static com.jogamp.gluegen.runtime.BufferFactory.*; /** * CLContext is responsible for managing objects such as command-queues, memory, diff --git a/src/com/mbien/opencl/CLDevice.java b/src/com/mbien/opencl/CLDevice.java index 1daa8a85..624fd1f7 100644 --- a/src/com/mbien/opencl/CLDevice.java +++ b/src/com/mbien/opencl/CLDevice.java @@ -1,8 +1,8 @@ package com.mbien.opencl; import com.mbien.opencl.util.CLUtil; -import com.sun.gluegen.runtime.CPU; -import com.sun.gluegen.runtime.PointerBuffer; +import com.jogamp.gluegen.runtime.CPU; +import com.jogamp.gluegen.runtime.PointerBuffer; import java.nio.Buffer; import java.nio.ByteBuffer; import java.util.ArrayList; diff --git a/src/com/mbien/opencl/CLEvent.java b/src/com/mbien/opencl/CLEvent.java index 1eb3bb64..eb77f194 100644 --- a/src/com/mbien/opencl/CLEvent.java +++ b/src/com/mbien/opencl/CLEvent.java @@ -1,6 +1,6 @@ package com.mbien.opencl; -import com.sun.gluegen.runtime.PointerBuffer; +import com.jogamp.gluegen.runtime.PointerBuffer; import java.nio.Buffer; import static com.mbien.opencl.CL.*; diff --git a/src/com/mbien/opencl/CLEventList.java b/src/com/mbien/opencl/CLEventList.java index 6a2716db..27cbaaf5 100644 --- a/src/com/mbien/opencl/CLEventList.java +++ b/src/com/mbien/opencl/CLEventList.java @@ -1,6 +1,6 @@ package com.mbien.opencl; -import com.sun.gluegen.runtime.PointerBuffer; +import com.jogamp.gluegen.runtime.PointerBuffer; import java.util.Iterator; /** diff --git a/src/com/mbien/opencl/CLImage.java b/src/com/mbien/opencl/CLImage.java index 883a4781..1718ac3a 100644 --- a/src/com/mbien/opencl/CLImage.java +++ b/src/com/mbien/opencl/CLImage.java @@ -1,6 +1,6 @@ package com.mbien.opencl; -import com.sun.gluegen.runtime.PointerBuffer; +import com.jogamp.gluegen.runtime.PointerBuffer; import java.nio.Buffer; import static com.mbien.opencl.CL.*; diff --git a/src/com/mbien/opencl/CLImage2d.java b/src/com/mbien/opencl/CLImage2d.java index 9345244e..337b0021 100644 --- a/src/com/mbien/opencl/CLImage2d.java +++ b/src/com/mbien/opencl/CLImage2d.java @@ -1,6 +1,6 @@ package com.mbien.opencl; -import com.sun.gluegen.runtime.BufferFactory; +import com.jogamp.gluegen.runtime.BufferFactory; import java.nio.Buffer; import java.nio.IntBuffer; diff --git a/src/com/mbien/opencl/CLImage3d.java b/src/com/mbien/opencl/CLImage3d.java index afb162c2..bef7ac57 100644 --- a/src/com/mbien/opencl/CLImage3d.java +++ b/src/com/mbien/opencl/CLImage3d.java @@ -1,6 +1,6 @@ package com.mbien.opencl; -import com.sun.gluegen.runtime.BufferFactory; +import com.jogamp.gluegen.runtime.BufferFactory; import java.nio.Buffer; import java.nio.IntBuffer; diff --git a/src/com/mbien/opencl/CLInfoAccessor.java b/src/com/mbien/opencl/CLInfoAccessor.java index 554545b9..44eb5fe4 100644 --- a/src/com/mbien/opencl/CLInfoAccessor.java +++ b/src/com/mbien/opencl/CLInfoAccessor.java @@ -1,7 +1,7 @@ package com.mbien.opencl; import com.mbien.opencl.util.CLUtil; -import com.sun.gluegen.runtime.PointerBuffer; +import com.jogamp.gluegen.runtime.PointerBuffer; import java.nio.Buffer; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/src/com/mbien/opencl/CLKernel.java b/src/com/mbien/opencl/CLKernel.java index 4b60cab9..0ef2d835 100644 --- a/src/com/mbien/opencl/CLKernel.java +++ b/src/com/mbien/opencl/CLKernel.java @@ -1,9 +1,9 @@ package com.mbien.opencl; import com.mbien.opencl.util.CLUtil; -import com.sun.gluegen.runtime.BufferFactory; -import com.sun.gluegen.runtime.CPU; -import com.sun.gluegen.runtime.PointerBuffer; +import com.jogamp.gluegen.runtime.BufferFactory; +import com.jogamp.gluegen.runtime.CPU; +import com.jogamp.gluegen.runtime.PointerBuffer; import java.nio.Buffer; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/src/com/mbien/opencl/CLMemory.java b/src/com/mbien/opencl/CLMemory.java index 444acba2..ff34b344 100644 --- a/src/com/mbien/opencl/CLMemory.java +++ b/src/com/mbien/opencl/CLMemory.java @@ -1,8 +1,8 @@ package com.mbien.opencl; import com.mbien.opencl.gl.CLGLI; -import com.sun.gluegen.runtime.BufferFactory; -import com.sun.gluegen.runtime.PointerBuffer; +import com.jogamp.gluegen.runtime.BufferFactory; +import com.jogamp.gluegen.runtime.PointerBuffer; import java.nio.Buffer; import java.nio.ByteBuffer; import java.nio.DoubleBuffer; diff --git a/src/com/mbien/opencl/CLPlatform.java b/src/com/mbien/opencl/CLPlatform.java index f1a35db0..85868387 100644 --- a/src/com/mbien/opencl/CLPlatform.java +++ b/src/com/mbien/opencl/CLPlatform.java @@ -2,7 +2,7 @@ package com.mbien.opencl; import com.mbien.opencl.util.CLUtil; import com.mbien.opencl.impl.CLImpl; -import com.sun.gluegen.runtime.PointerBuffer; +import com.jogamp.gluegen.runtime.PointerBuffer; import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.nio.IntBuffer; diff --git a/src/com/mbien/opencl/CLProgram.java b/src/com/mbien/opencl/CLProgram.java index 58071a59..ced89720 100644 --- a/src/com/mbien/opencl/CLProgram.java +++ b/src/com/mbien/opencl/CLProgram.java @@ -2,9 +2,9 @@ package com.mbien.opencl; import com.mbien.opencl.util.CLProgramConfiguration; import com.mbien.opencl.util.CLUtil; -import com.sun.gluegen.runtime.BufferFactory; -import com.sun.gluegen.runtime.CPU; -import com.sun.gluegen.runtime.PointerBuffer; +import com.jogamp.gluegen.runtime.BufferFactory; +import com.jogamp.gluegen.runtime.CPU; +import com.jogamp.gluegen.runtime.PointerBuffer; import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.nio.IntBuffer; diff --git a/src/com/mbien/opencl/CLSampler.java b/src/com/mbien/opencl/CLSampler.java index 73e98013..8b7c9386 100644 --- a/src/com/mbien/opencl/CLSampler.java +++ b/src/com/mbien/opencl/CLSampler.java @@ -1,6 +1,6 @@ package com.mbien.opencl; -import com.sun.gluegen.runtime.PointerBuffer; +import com.jogamp.gluegen.runtime.PointerBuffer; import java.nio.Buffer; import static com.mbien.opencl.CLException.*; diff --git a/src/com/mbien/opencl/gl/CLGLContext.java b/src/com/mbien/opencl/gl/CLGLContext.java index ec0f909f..04443c79 100644 --- a/src/com/mbien/opencl/gl/CLGLContext.java +++ b/src/com/mbien/opencl/gl/CLGLContext.java @@ -5,7 +5,7 @@ import com.mbien.opencl.CLDevice; import java.nio.Buffer; import com.mbien.opencl.CLMemory.Mem; import com.mbien.opencl.CLPlatform; -import com.sun.gluegen.runtime.PointerBuffer; +import com.jogamp.gluegen.runtime.PointerBuffer; import com.sun.opengl.impl.GLContextImpl; import com.sun.opengl.impl.macosx.cgl.MacOSXCGLContext; import com.sun.opengl.impl.windows.wgl.WindowsWGLContext; diff --git a/test/com/mbien/opencl/CLBufferTest.java b/test/com/mbien/opencl/CLBufferTest.java index 7a16e9d7..f8c263f3 100644 --- a/test/com/mbien/opencl/CLBufferTest.java +++ b/test/com/mbien/opencl/CLBufferTest.java @@ -9,7 +9,7 @@ import org.junit.Test; import static org.junit.Assert.*; import static java.lang.System.*; import static com.mbien.opencl.TestUtils.*; -import static com.sun.gluegen.runtime.BufferFactory.*; +import static com.jogamp.gluegen.runtime.BufferFactory.*; /** * diff --git a/test/com/mbien/opencl/CLCommandQueueTest.java b/test/com/mbien/opencl/CLCommandQueueTest.java index 66757348..5857bc46 100644 --- a/test/com/mbien/opencl/CLCommandQueueTest.java +++ b/test/com/mbien/opencl/CLCommandQueueTest.java @@ -12,7 +12,7 @@ import static org.junit.Assert.*; import static java.lang.System.*; import static com.mbien.opencl.TestUtils.*; import static com.mbien.opencl.CLEvent.*; -import static com.sun.gluegen.runtime.BufferFactory.*; +import static com.jogamp.gluegen.runtime.BufferFactory.*; /** * diff --git a/test/com/mbien/opencl/HighLevelBindingTest.java b/test/com/mbien/opencl/HighLevelBindingTest.java index 44a4a1b9..e5bf657c 100644 --- a/test/com/mbien/opencl/HighLevelBindingTest.java +++ b/test/com/mbien/opencl/HighLevelBindingTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import static org.junit.Assert.*; import static java.lang.System.*; import static com.mbien.opencl.TestUtils.*; -import static com.sun.gluegen.runtime.BufferFactory.*; +import static com.jogamp.gluegen.runtime.BufferFactory.*; /** * Test testing the high level bindings. diff --git a/test/com/mbien/opencl/LowLevelBindingTest.java b/test/com/mbien/opencl/LowLevelBindingTest.java index 935ba73c..a7ad57bc 100644 --- a/test/com/mbien/opencl/LowLevelBindingTest.java +++ b/test/com/mbien/opencl/LowLevelBindingTest.java @@ -1,8 +1,8 @@ package com.mbien.opencl; import com.mbien.opencl.impl.CLImpl; -import com.sun.gluegen.runtime.CPU; -import com.sun.gluegen.runtime.PointerBuffer; +import com.jogamp.gluegen.runtime.CPU; +import com.jogamp.gluegen.runtime.PointerBuffer; import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.nio.IntBuffer; @@ -13,7 +13,7 @@ import static org.junit.Assert.*; import static java.lang.System.*; import static com.mbien.opencl.TestUtils.*; import static com.mbien.opencl.util.CLUtil.*; -import static com.sun.gluegen.runtime.BufferFactory.*; +import static com.jogamp.gluegen.runtime.BufferFactory.*; /** * Test testing the low level bindings. |