ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/OpenCL/OpenCL.xs
(Generate patch)

Comparing OpenCL/OpenCL.xs (file contents):
Revision 1.27 by root, Thu Apr 19 13:18:31 2012 UTC vs.
Revision 1.47 by root, Tue Apr 24 13:30:49 2012 UTC

1#include "EXTERN.h" 1#include "EXTERN.h"
2#include "perl.h" 2#include "perl.h"
3#include "XSUB.h" 3#include "XSUB.h"
4
5#ifdef I_DLFCN
6 #include <dlfcn.h>
7#endif
8
9// how stupid is that, the 1.2 header files define CL_VERSION_1_1,
10// but then fail to define the api functions unless you ALSO define
11// this. This breaks 100% of the opencl 1.1 apps, for what reason?
12// after all, the functions are deprecated, not removed.
13// in addition, you cannot test for this in any future-proof way.
14// each time a new opencl version comes out, you need to make a new
15// release.
16#define CL_USE_DEPRECATED_OPENCL_1_2_APIS /* just guessing, you stupid idiots */
17
18#ifndef PREFER_1_1
19 #define PREFER_1_1 1
20#endif
21
22#if PREFER_1_1
23 #define CL_USE_DEPRECATED_OPENCL_1_1_APIS
24#endif
4 25
5#ifdef __APPLE__ 26#ifdef __APPLE__
6 #include <OpenCL/opencl.h> 27 #include <OpenCL/opencl.h>
7#else 28#else
8 #include <CL/opencl.h> 29 #include <CL/opencl.h>
30#endif
31
32#ifndef CL_VERSION_1_2
33 #undef PREFER_1_1
34 #define PREFER_1_1 1
9#endif 35#endif
10 36
11typedef cl_platform_id OpenCL__Platform; 37typedef cl_platform_id OpenCL__Platform;
12typedef cl_device_id OpenCL__Device; 38typedef cl_device_id OpenCL__Device;
13typedef cl_context OpenCL__Context; 39typedef cl_context OpenCL__Context;
… …
31 57
32typedef SV *FUTURE; 58typedef SV *FUTURE;
33 59
34/*****************************************************************************/ 60/*****************************************************************************/
35 61
62// name must include a leading underscore
63// all of this horrors would be unneceesary if somebody wrote a proper OpenGL module
64// for perl. doh.
65static void *
66glsym (const char *name)
67{
68 void *fun = 0;
69
70 #if defined I_DLFCN && defined RTLD_DEFAULT
71 fun = dlsym (RTLD_DEFAULT, name + 1);
72 if (!fun) fun = dlsym (RTLD_DEFAULT, name);
73
74 if (!fun)
75 {
76 static void *libgl;
77 static const char *glso[] = {
78 "libGL.so.1",
79 "libGL.so.3",
80 "libGL.so.4.0",
81 "libGL.so",
82 "/usr/lib/libGL.so",
83 "/usr/X11R6/lib/libGL.1.dylib"
84 };
85 int i;
86
87 for (i = 0; !libgl && i < sizeof (glso) / sizeof (glso [0]); ++i)
88 {
89 libgl = dlopen (glso [i], RTLD_LAZY);
90 if (libgl)
91 break;
92 }
93
94 if (libgl)
95 {
96 fun = dlsym (libgl, name + 1);
97 if (!fun) fun = dlsym (libgl, name);
98 }
99 }
100 #endif
101
102 return fun;
103}
104
105/*****************************************************************************/
106
36/* up to two temporary buffers */ 107/* up to two temporary buffers */
37static void * 108static void *
38tmpbuf (size_t size) 109tmpbuf (size_t size)
39{ 110{
40 enum { buffers = 3 }; 111 enum { buffers = 3 };
41 static int idx; 112 static int idx;
42 static void *buf [buffers]; 113 static void *buf [buffers];
43 static size_t len [buffers]; 114 static size_t len [buffers];
44 115
45 idx = ++idx % buffers; 116 idx = (idx + 1) % buffers;
46 117
47 if (len [idx] < size) 118 if (len [idx] < size)
48 { 119 {
49 free (buf [idx]); 120 free (buf [idx]);
50 len [idx] = ((size + 31) & ~4095) + 4096 - 32; 121 len [idx] = ((size + 31) & ~4095) + 4096 - 32;
… …
144 return 0; 215 return 0;
145 216
146 if (SvROK (sv) && SvTYPE (SvRV (sv)) == SVt_PVAV) 217 if (SvROK (sv) && SvTYPE (SvRV (sv)) == SVt_PVAV)
147 { 218 {
148 AV *av = (AV *)SvRV (sv); 219 AV *av = (AV *)SvRV (sv);
149 int i, len = av_len (av); 220 int i, len = av_len (av) + 1;
150 cl_context_properties *p = tmpbuf (sizeof (cl_context_properties) * (len + extracount + 1)); 221 cl_context_properties *p = tmpbuf (sizeof (cl_context_properties) * (len + extracount + 1));
151 cl_context_properties *l = p; 222 cl_context_properties *l = p;
152 223
153 if (len & 1) 224 if (len & 1)
154 croak ("%s: %s is not a property list (must be even number of elements)", func, svname); 225 croak ("%s: %s is not a property list (must be even number of elements)", func, svname);
… …
156 while (extracount--) 227 while (extracount--)
157 *l++ = *extra++; 228 *l++ = *extra++;
158 229
159 for (i = 0; i < len; i += 2) 230 for (i = 0; i < len; i += 2)
160 { 231 {
161 cl_context_properties t = SvIV (*av_fetch (av, i, 0)); 232 cl_context_properties t = SvIV (*av_fetch (av, i , 0));
162 cl_context_properties v; 233 SV *p_sv = *av_fetch (av, i + 1, 0);
234 cl_context_properties v = SvIV (p_sv); // code below can override
163 235
164 switch (t) 236 switch (t)
165 { 237 {
238 case CL_GLX_DISPLAY_KHR:
239 if (!SvOK (p_sv))
240 {
241 void *func = glsym ("_glXGetCurrentDisplay");
242 if (func)
243 v = (cl_context_properties)((void *(*)(void))func)();
244 }
245 break;
246
247 case CL_GL_CONTEXT_KHR:
248 if (!SvOK (p_sv))
249 {
250 void *func = glsym ("_glXGetCurrentContext");
251 if (func)
252 v = (cl_context_properties)((void *(*)(void))func)();
253 }
254 break;
255
166 default: 256 default:
167 /* unknown property, treat as int */ 257 /* unknown property, treat as int */
168 v = SvIV (*av_fetch (av, i, 0));
169 break; 258 break;
170 } 259 }
171 260
172 *l++ = t; 261 *l++ = t;
173 *l++ = v; 262 *l++ = v;
… …
190 clGetImageInfo (img, CL_IMAGE_ROW_PITCH, sizeof (res), &res, 0); 279 clGetImageInfo (img, CL_IMAGE_ROW_PITCH, sizeof (res), &res, 0);
191 return res; 280 return res;
192} 281}
193 282
194static cl_event * 283static cl_event *
195event_list (SV **items, int count) 284event_list (SV **items, cl_uint *rcount)
196{ 285{
286 cl_uint count = *rcount;
287
197 if (!count) 288 if (!count)
198 return 0; 289 return 0;
199 290
200 cl_event *list = tmpbuf (sizeof (cl_event) * count); 291 cl_event *list = tmpbuf (sizeof (cl_event) * count);
292 int i = 0;
201 293
202 while (count--) 294 do
295 {
296 --count;
297 if (SvOK (items [count]))
203 list [count] = SvPTROBJ ("clEnqueue", "wait_events", items [count], "OpenCL::Event"); 298 list [i++] = SvPTROBJ ("clEnqueue", "wait_events", items [count], "OpenCL::Event");
299 }
300 while (count);
204 301
302 *rcount = i;
303
205 return list; 304 return i ? list : 0;
206} 305}
207 306
208#define EVENT_LIST(items,count) \ 307#define EVENT_LIST(items,count) \
209 cl_uint event_list_count = (count); \ 308 cl_uint event_list_count = (count); \
210 cl_event *event_list_ptr = event_list (&ST (items), event_list_count) 309 cl_event *event_list_ptr = event_list (&ST (items), &event_list_count)
211 310
212#define INFO(class) \ 311#define INFO(class) \
213{ \ 312{ \
214 size_t size; \ 313 size_t size; \
215 NEED_SUCCESS (Get ## class ## Info, (self, name, 0, 0, &size)); \ 314 NEED_SUCCESS (Get ## class ## Info, (self, name, 0, 0, &size)); \
… …
247} 346}
248 347
249cl_int 348cl_int
250errno () 349errno ()
251 CODE: 350 CODE:
252 errno = res; 351 RETVAL = res;
352 OUTPUT:
353 RETVAL
253 354
254const char * 355const char *
255err2str (cl_int err) 356err2str (cl_int err)
256 357
257const char * 358const char *
… …
276context_from_type (cl_context_properties *properties = 0, cl_device_type type = CL_DEVICE_TYPE_DEFAULT, FUTURE notify = 0) 377context_from_type (cl_context_properties *properties = 0, cl_device_type type = CL_DEVICE_TYPE_DEFAULT, FUTURE notify = 0)
277 PPCODE: 378 PPCODE:
278 NEED_SUCCESS_ARG (cl_context ctx, CreateContextFromType, (properties, type, 0, 0, &res)); 379 NEED_SUCCESS_ARG (cl_context ctx, CreateContextFromType, (properties, type, 0, 0, &res));
279 XPUSH_NEW_OBJ ("OpenCL::Context", ctx); 380 XPUSH_NEW_OBJ ("OpenCL::Context", ctx);
280 381
382#if 0
383
281void 384void
282context (cl_context_properties *properties = 0, FUTURE devices, FUTURE notify = 0) 385context (cl_context_properties *properties = 0, FUTURE devices, FUTURE notify = 0)
283 PPCODE: 386 PPCODE:
284 /* der Gipfel der Kunst */ 387 /* der Gipfel der Kunst */
388
389#endif
285 390
286void 391void
287wait_for_events (...) 392wait_for_events (...)
288 CODE: 393 CODE:
289 EVENT_LIST (0, items); 394 EVENT_LIST (0, items);
… …
295 400
296void 401void
297info (OpenCL::Platform self, cl_platform_info name) 402info (OpenCL::Platform self, cl_platform_info name)
298 PPCODE: 403 PPCODE:
299 INFO (Platform) 404 INFO (Platform)
405
406void
407unload_compiler (OpenCL::Platform self)
408 CODE:
409#if CL_VERSION_1_2
410 clUnloadPlatformCompiler (self);
411#endif
300 412
301#BEGIN:platform 413#BEGIN:platform
302 414
303void 415void
304profile (OpenCL::Platform self) 416profile (OpenCL::Platform self)
… …
404 native_vector_width_int = CL_DEVICE_NATIVE_VECTOR_WIDTH_INT 516 native_vector_width_int = CL_DEVICE_NATIVE_VECTOR_WIDTH_INT
405 native_vector_width_long = CL_DEVICE_NATIVE_VECTOR_WIDTH_LONG 517 native_vector_width_long = CL_DEVICE_NATIVE_VECTOR_WIDTH_LONG
406 native_vector_width_float = CL_DEVICE_NATIVE_VECTOR_WIDTH_FLOAT 518 native_vector_width_float = CL_DEVICE_NATIVE_VECTOR_WIDTH_FLOAT
407 native_vector_width_double = CL_DEVICE_NATIVE_VECTOR_WIDTH_DOUBLE 519 native_vector_width_double = CL_DEVICE_NATIVE_VECTOR_WIDTH_DOUBLE
408 native_vector_width_half = CL_DEVICE_NATIVE_VECTOR_WIDTH_HALF 520 native_vector_width_half = CL_DEVICE_NATIVE_VECTOR_WIDTH_HALF
409 reference_count_ext = CL_DEVICE_REFERENCE_COUNT_EXT 521 reference_count_ext = CL_DEVICE_REFERENCE_COUNT_EXT
410 PPCODE: 522 PPCODE:
411 cl_uint value [1]; 523 cl_uint value [1];
412 NEED_SUCCESS (GetDeviceInfo, (self, ix, sizeof (value), value, 0)); 524 NEED_SUCCESS (GetDeviceInfo, (self, ix, sizeof (value), value, 0));
413 EXTEND (SP, 1); 525 EXTEND (SP, 1);
414 const int i = 0; 526 const int i = 0;
… …
631 if (!(flags & (CL_MEM_USE_HOST_PTR | CL_MEM_COPY_HOST_PTR))) 743 if (!(flags & (CL_MEM_USE_HOST_PTR | CL_MEM_COPY_HOST_PTR)))
632 croak ("OpenCL::Context::buffer_sv: you have to specify use or copy host ptr when buffer data is given, use $context->buffer instead?"); 744 croak ("OpenCL::Context::buffer_sv: you have to specify use or copy host ptr when buffer data is given, use $context->buffer instead?");
633 NEED_SUCCESS_ARG (cl_mem mem, CreateBuffer, (self, flags, len, ptr, &res)); 745 NEED_SUCCESS_ARG (cl_mem mem, CreateBuffer, (self, flags, len, ptr, &res));
634 XPUSH_NEW_OBJ ("OpenCL::BufferObj", mem); 746 XPUSH_NEW_OBJ ("OpenCL::BufferObj", mem);
635 747
748#if CL_VERSION_1_2
749
636void 750void
637image2d (OpenCL::Context self, cl_mem_flags flags, cl_channel_order channel_order, cl_channel_type channel_type, size_t width, size_t height, size_t row_pitch = 0, SV *data = &PL_sv_undef) 751image (OpenCL::Context self, cl_mem_flags flags, cl_channel_order channel_order, cl_channel_type channel_type, cl_mem_object_type type, size_t width, size_t height, size_t depth, size_t array_size = 0, size_t row_pitch = 0, size_t slice_pitch = 0, cl_uint num_mip_level = 0, cl_uint num_samples = 0, SV *data = &PL_sv_undef)
638 PPCODE: 752 PPCODE:
639 STRLEN len; 753 STRLEN len;
640 char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0; 754 char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0;
641 const cl_image_format format = { channel_order, channel_type }; 755 const cl_image_format format = { channel_order, channel_type };
756 const cl_image_desc desc = {
757 type,
758 width, height, depth,
759 array_size, row_pitch, slice_pitch,
760 num_mip_level, num_samples,
761 type == CL_MEM_OBJECT_IMAGE1D_BUFFER ? (cl_mem)SvPTROBJ ("OpenCL::Context::Image", "data", data, "OpenCL::Buffer") : 0
762 };
642 NEED_SUCCESS_ARG (cl_mem mem, CreateImage2D, (self, flags, &format, width, height, row_pitch, ptr, &res)); 763 NEED_SUCCESS_ARG (cl_mem mem, CreateImage, (self, flags, &format, &desc, ptr, &res));
764 char *klass = "OpenCL::Image";
765 switch (type)
766 {
767 case CL_MEM_OBJECT_IMAGE1D_BUFFER: klass = "OpenCL::Image1DBuffer"; break;
768 case CL_MEM_OBJECT_IMAGE1D: klass = "OpenCL::Image1D"; break;
769 case CL_MEM_OBJECT_IMAGE1D_ARRAY: klass = "OpenCL::Image2DArray"; break;
770 case CL_MEM_OBJECT_IMAGE2D: klass = "OpenCL::Image2D"; break;
771 case CL_MEM_OBJECT_IMAGE2D_ARRAY: klass = "OpenCL::Image2DArray"; break;
772 case CL_MEM_OBJECT_IMAGE3D: klass = "OpenCL::Image3D"; break;
773 }
643 XPUSH_NEW_OBJ ("OpenCL::Image2D", mem); 774 XPUSH_NEW_OBJ (klass, mem);
644 775
776#endif
777
645void 778void
646image3d (OpenCL::Context self, cl_mem_flags flags, cl_channel_order channel_order, cl_channel_type channel_type, size_t width, size_t height, size_t depth, size_t row_pitch = 0, size_t slice_pitch = 0, SV *data = &PL_sv_undef) 779image2d (OpenCL::Context self, cl_mem_flags flags, cl_channel_order channel_order, cl_channel_type channel_type, size_t width, size_t height, size_t row_pitch = 0, SV *data = &PL_sv_undef)
647 PPCODE: 780 PPCODE:
648 STRLEN len; 781 STRLEN len;
649 char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0; 782 char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0;
650 const cl_image_format format = { channel_order, channel_type }; 783 const cl_image_format format = { channel_order, channel_type };
784#if PREFER_1_1
785 NEED_SUCCESS_ARG (cl_mem mem, CreateImage2D, (self, flags, &format, width, height, row_pitch, ptr, &res));
786#else
787 const cl_image_desc desc = { CL_MEM_OBJECT_IMAGE2D, width, height, 0, 0, row_pitch, 0, 0, 0, 0 };
788 NEED_SUCCESS_ARG (cl_mem mem, CreateImage, (self, flags, &format, &desc, ptr, &res));
789#endif
790 XPUSH_NEW_OBJ ("OpenCL::Image2D", mem);
791
792void
793image3d (OpenCL::Context self, cl_mem_flags flags, cl_channel_order channel_order, cl_channel_type channel_type, size_t width, size_t height, size_t depth, size_t row_pitch = 0, size_t slice_pitch = 0, SV *data = &PL_sv_undef)
794 PPCODE:
795 STRLEN len;
796 char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0;
797 const cl_image_format format = { channel_order, channel_type };
798#if PREFER_1_1
651 NEED_SUCCESS_ARG (cl_mem mem, CreateImage3D, (self, flags, &format, width, height, depth, row_pitch, slice_pitch, ptr, &res)); 799 NEED_SUCCESS_ARG (cl_mem mem, CreateImage3D, (self, flags, &format, width, height, depth, row_pitch, slice_pitch, ptr, &res));
800#else
801 const cl_image_desc desc = { CL_MEM_OBJECT_IMAGE3D, width, height, depth, 0, row_pitch, slice_pitch, 0, 0, 0 };
802 NEED_SUCCESS_ARG (cl_mem mem, CreateImage, (self, flags, &format, &desc, ptr, &res));
803#endif
652 XPUSH_NEW_OBJ ("OpenCL::Image3D", mem); 804 XPUSH_NEW_OBJ ("OpenCL::Image3D", mem);
653 805
654#if cl_apple_gl_sharing || cl_khr_gl_sharing 806#if cl_apple_gl_sharing || cl_khr_gl_sharing
655 807
656void 808void
… …
658 PPCODE: 810 PPCODE:
659 NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLBuffer, (self, flags, bufobj, &res)); 811 NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLBuffer, (self, flags, bufobj, &res));
660 XPUSH_NEW_OBJ ("OpenCL::BufferObj", mem); 812 XPUSH_NEW_OBJ ("OpenCL::BufferObj", mem);
661 813
662void 814void
663gl_texture2d (OpenCL::Context self, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture)
664 PPCODE:
665 NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture2D, (self, flags, target, miplevel, texture, &res));
666 XPUSH_NEW_OBJ ("OpenCL::Image2D", mem);
667
668void
669gl_texture3d (OpenCL::Context self, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture)
670 PPCODE:
671 NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture3D, (self, flags, target, miplevel, texture, &res));
672 XPUSH_NEW_OBJ ("OpenCL::Image3D", mem);
673
674void
675gl_renderbuffer (OpenCL::Context self, cl_mem_flags flags, cl_GLuint renderbuffer) 815gl_renderbuffer (OpenCL::Context self, cl_mem_flags flags, cl_GLuint renderbuffer)
676 PPCODE: 816 PPCODE:
677 NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLRenderbuffer, (self, flags, renderbuffer, &res)); 817 NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLRenderbuffer, (self, flags, renderbuffer, &res));
678 XPUSH_NEW_OBJ ("OpenCL::Image2D", mem); 818 XPUSH_NEW_OBJ ("OpenCL::Image2D", mem);
819
820#if CL_VERSION_1_2
821
822void
823gl_texture (OpenCL::Context self, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture)
824 ALIAS:
825 PPCODE:
826 NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture, (self, flags, target, miplevel, texture, &res));
827 cl_gl_object_type type;
828 NEED_SUCCESS (GetGLObjectInfo, (mem, &type, 0)); // TODO: use target instead?
829 char *klass = "OpenCL::Memory";
830 switch (type)
831 {
832 case CL_GL_OBJECT_TEXTURE_BUFFER: klass = "OpenCL::Image1DBuffer"; break;
833 case CL_GL_OBJECT_TEXTURE1D: klass = "OpenCL::Image1D"; break;
834 case CL_GL_OBJECT_TEXTURE1D_ARRAY: klass = "OpenCL::Image2DArray"; break;
835 case CL_GL_OBJECT_TEXTURE2D: klass = "OpenCL::Image2D"; break;
836 case CL_GL_OBJECT_TEXTURE2D_ARRAY: klass = "OpenCL::Image2DArray"; break;
837 case CL_GL_OBJECT_TEXTURE3D: klass = "OpenCL::Image3D"; break;
838 }
839 XPUSH_NEW_OBJ (klass, mem);
840
841#endif
842
843void
844gl_texture2d (OpenCL::Context self, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture)
845 PPCODE:
846#if PREFER_1_1
847 NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture2D, (self, flags, target, miplevel, texture, &res));
848#else
849 NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture , (self, flags, target, miplevel, texture, &res));
850#endif
851 XPUSH_NEW_OBJ ("OpenCL::Image2D", mem);
852
853void
854gl_texture3d (OpenCL::Context self, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture)
855 PPCODE:
856#if PREFER_1_1
857 NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture3D, (self, flags, target, miplevel, texture, &res));
858#else
859 NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture , (self, flags, target, miplevel, texture, &res));
860#endif
861 XPUSH_NEW_OBJ ("OpenCL::Image3D", mem);
679 862
680#endif 863#endif
681 864
682void 865void
683supported_image_formats (OpenCL::Context self, cl_mem_flags flags, cl_mem_object_type image_type) 866supported_image_formats (OpenCL::Context self, cl_mem_flags flags, cl_mem_object_type image_type)
… …
788 cl_event ev = 0; 971 cl_event ev = 0;
789 STRLEN len; 972 STRLEN len;
790 char *ptr = SvPVbyte (data, len); 973 char *ptr = SvPVbyte (data, len);
791 EVENT_LIST (5, items - 5); 974 EVENT_LIST (5, items - 5);
792 975
793 NEED_SUCCESS (EnqueueReadBuffer, (self, mem, blocking, offset, len, ptr, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0)); 976 NEED_SUCCESS (EnqueueWriteBuffer, (self, mem, blocking, offset, len, ptr, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0));
794 977
795 if (ev) 978 if (ev)
796 XPUSH_NEW_OBJ ("OpenCL::Event", ev); 979 XPUSH_NEW_OBJ ("OpenCL::Event", ev);
797 980
798void 981void
… …
864 size_t min_len = host_row_pitch * host_slice_pitch * region [2]; 1047 size_t min_len = host_row_pitch * host_slice_pitch * region [2];
865 1048
866 if (len < min_len) 1049 if (len < min_len)
867 croak ("clEnqueueWriteImage: data string is shorter than what would be transferred"); 1050 croak ("clEnqueueWriteImage: data string is shorter than what would be transferred");
868 1051
869 NEED_SUCCESS (EnqueueWriteBufferRect, (self, buf, blocking, buf_origin, host_origin, region, buf_row_pitch, buf_slice_pitch, host_row_pitch, host_slice_pitch, SvPVX (data), event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0)); 1052 NEED_SUCCESS (EnqueueWriteBufferRect, (self, buf, blocking, buf_origin, host_origin, region, buf_row_pitch, buf_slice_pitch, host_row_pitch, host_slice_pitch, ptr, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0));
870 1053
871 if (ev) 1054 if (ev)
872 XPUSH_NEW_OBJ ("OpenCL::Event", ev); 1055 XPUSH_NEW_OBJ ("OpenCL::Event", ev);
873 1056
874void 1057void
… …
929 size_t min_len = slice_pitch ? slice_pitch * depth : row_pitch * height; 1112 size_t min_len = slice_pitch ? slice_pitch * depth : row_pitch * height;
930 1113
931 if (len < min_len) 1114 if (len < min_len)
932 croak ("clEnqueueWriteImage: data string is shorter than what would be transferred"); 1115 croak ("clEnqueueWriteImage: data string is shorter than what would be transferred");
933 1116
934 NEED_SUCCESS (EnqueueWriteImage, (self, dst, blocking, dst_origin, region, row_pitch, slice_pitch, SvPVX (data), event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0)); 1117 NEED_SUCCESS (EnqueueWriteImage, (self, dst, blocking, dst_origin, region, row_pitch, slice_pitch, ptr, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0));
935 1118
936 if (ev) 1119 if (ev)
937 XPUSH_NEW_OBJ ("OpenCL::Event", ev); 1120 XPUSH_NEW_OBJ ("OpenCL::Event", ev);
938 1121
939void 1122void
… …
1021 gwo [i] = SvIV (AvARRAY (SvRV (global_work_offset))[i]); 1204 gwo [i] = SvIV (AvARRAY (SvRV (global_work_offset))[i]);
1022 } 1205 }
1023 1206
1024 if (SvOK (local_work_size)) 1207 if (SvOK (local_work_size))
1025 { 1208 {
1026 if (SvOK (local_work_size) && !SvROK (local_work_size) || SvTYPE (SvRV (local_work_size)) != SVt_PVAV) 1209 if ((SvOK (local_work_size) && !SvROK (local_work_size)) || SvTYPE (SvRV (local_work_size)) != SVt_PVAV)
1027 croak ("clEnqueueNDRangeKernel: global_work_size must be undef or an array reference"); 1210 croak ("clEnqueueNDRangeKernel: global_work_size must be undef or an array reference");
1028 1211
1029 if (AvFILLp (SvRV (local_work_size)) + 1 != gws_len) 1212 if (AvFILLp (SvRV (local_work_size)) + 1 != gws_len)
1030 croak ("clEnqueueNDRangeKernel: local_work_local must be undef or an array of same size as global_work_size"); 1213 croak ("clEnqueueNDRangeKernel: local_work_local must be undef or an array of same size as global_work_size");
1031 1214
… …
1043 1226
1044void 1227void
1045enqueue_acquire_gl_objects (OpenCL::Queue self, SV *objects, ...) 1228enqueue_acquire_gl_objects (OpenCL::Queue self, SV *objects, ...)
1046 ALIAS: 1229 ALIAS:
1047 enqueue_release_gl_objects = 1 1230 enqueue_release_gl_objects = 1
1048 CODE: 1231 PPCODE:
1049 if (!SvROK (objects) || SvTYPE (SvRV (objects)) != SVt_PVAV) 1232 if (!SvROK (objects) || SvTYPE (SvRV (objects)) != SVt_PVAV)
1050 croak ("OpenCL::Queue::enqueue_acquire/release_gl_objects argument 'objects' must be an arrayref with memory objects, in call"); 1233 croak ("OpenCL::Queue::enqueue_acquire/release_gl_objects argument 'objects' must be an arrayref with memory objects, in call");
1051 1234
1052 cl_event ev = 0; 1235 cl_event ev = 0;
1053 EVENT_LIST (2, items - 2); 1236 EVENT_LIST (2, items - 2);
… …
1068 XPUSH_NEW_OBJ ("OpenCL::Event", ev); 1251 XPUSH_NEW_OBJ ("OpenCL::Event", ev);
1069 1252
1070#endif 1253#endif
1071 1254
1072void 1255void
1073enqueue_marker (OpenCL::Queue self)
1074 PPCODE:
1075 cl_event ev;
1076 NEED_SUCCESS (EnqueueMarker, (self, &ev));
1077 XPUSH_NEW_OBJ ("OpenCL::Event", ev);
1078
1079void
1080enqueue_wait_for_events (OpenCL::Queue self, ...) 1256enqueue_wait_for_events (OpenCL::Queue self, ...)
1081 CODE: 1257 CODE:
1082 EVENT_LIST (1, items - 1); 1258 EVENT_LIST (1, items - 1);
1259#if PREFER_1_1
1083 NEED_SUCCESS (EnqueueWaitForEvents, (self, event_list_count, event_list_ptr)); 1260 NEED_SUCCESS (EnqueueWaitForEvents, (self, event_list_count, event_list_ptr));
1261#else
1262 NEED_SUCCESS (EnqueueBarrierWithWaitList, (self, event_list_count, event_list_ptr, 0));
1263#endif
1084 1264
1085void 1265void
1266enqueue_marker (OpenCL::Queue self, ...)
1267 PPCODE:
1268 cl_event ev = 0;
1269 EVENT_LIST (1, items - 1);
1270#if PREFER_1_1
1271 if (!event_list_count)
1272 NEED_SUCCESS (EnqueueMarker, (self, GIMME_V != G_VOID ? &ev : 0));
1273 else
1274#if CL_VERSION_1_2
1275 NEED_SUCCESS (EnqueueMarkerWithWaitList, (self, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0));
1276#else
1277 NEED_SUCCESS (EnqueueWaitForEvents, (self, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0)); // also a barrier
1278#endif
1279#else
1280 NEED_SUCCESS (EnqueueMarkerWithWaitList, (self, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0));
1281#endif
1282 if (ev)
1283 XPUSH_NEW_OBJ ("OpenCL::Event", ev);
1284
1285void
1086enqueue_barrier (OpenCL::Queue self) 1286enqueue_barrier (OpenCL::Queue self, ...)
1087 CODE: 1287 PPCODE:
1288 cl_event ev = 0;
1289 EVENT_LIST (1, items - 1);
1290#if PREFER_1_1
1291 if (!event_list_count && GIMME_V == G_VOID)
1088 NEED_SUCCESS (EnqueueBarrier, (self)); 1292 NEED_SUCCESS (EnqueueBarrier, (self));
1293 else
1294#if CL_VERSION_1_2
1295 NEED_SUCCESS (EnqueueBarrierWithWaitList, (self, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0));
1296#else
1297 {
1298 if (event_list_count)
1299 NEED_SUCCESS (EnqueueWaitForEvents, (self, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0));
1300
1301 if (GIMME_V != G_VOID)
1302 NEED_SUCCESS (EnqueueMarker, (self, &ev));
1303 }
1304#endif
1305#else
1306 NEED_SUCCESS (EnqueueBarrierWithWaitList, (self, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0));
1307#endif
1308 if (ev)
1309 XPUSH_NEW_OBJ ("OpenCL::Event", ev);
1089 1310
1090void 1311void
1091flush (OpenCL::Queue self) 1312flush (OpenCL::Queue self)
1092 CODE: 1313 CODE:
1093 NEED_SUCCESS (Flush, (self)); 1314 NEED_SUCCESS (Flush, (self));
… …
1243void 1464void
1244gl_object_info (OpenCL::Memory self) 1465gl_object_info (OpenCL::Memory self)
1245 PPCODE: 1466 PPCODE:
1246 cl_gl_object_type type; 1467 cl_gl_object_type type;
1247 cl_GLuint name; 1468 cl_GLuint name;
1248 NEED_SUCCESS (clGetGLObjectInfo, (self, &type, &name)); 1469 NEED_SUCCESS (GetGLObjectInfo, (self, &type, &name));
1249 EXTEND (SP, 2); 1470 EXTEND (SP, 2);
1250 PUSHs (sv_2mortal (newSVuv (type))); 1471 PUSHs (sv_2mortal (newSVuv (type)));
1251 PUSHs (sv_2mortal (newSVuv (name))); 1472 PUSHs (sv_2mortal (newSVuv (name)));
1252 1473
1253#endif 1474#endif
… …
1298 1519
1299void 1520void
1300target (OpenCL::Image self) 1521target (OpenCL::Image self)
1301 PPCODE: 1522 PPCODE:
1302 cl_GLenum value [1]; 1523 cl_GLenum value [1];
1303 NEED_SUCCESS (GetGlTextureInfo, (self, CL_GL_TEXTURE_TARGET, sizeof (value), value, 0)); 1524 NEED_SUCCESS (GetGLTextureInfo, (self, CL_GL_TEXTURE_TARGET, sizeof (value), value, 0));
1304 EXTEND (SP, 1); 1525 EXTEND (SP, 1);
1305 const int i = 0; 1526 const int i = 0;
1306 PUSHs (sv_2mortal (newSVuv (value [i]))); 1527 PUSHs (sv_2mortal (newSVuv (value [i])));
1307 1528
1308void 1529void
1309gl_mipmap_level (OpenCL::Image self) 1530gl_mipmap_level (OpenCL::Image self)
1310 PPCODE: 1531 PPCODE:
1311 cl_GLint value [1]; 1532 cl_GLint value [1];
1312 NEED_SUCCESS (GetGlTextureInfo, (self, CL_GL_MIPMAP_LEVEL, sizeof (value), value, 0)); 1533 NEED_SUCCESS (GetGLTextureInfo, (self, CL_GL_MIPMAP_LEVEL, sizeof (value), value, 0));
1313 EXTEND (SP, 1); 1534 EXTEND (SP, 1);
1314 const int i = 0; 1535 const int i = 0;
1315 PUSHs (sv_2mortal (newSViv (value [i]))); 1536 PUSHs (sv_2mortal (newSViv (value [i])));
1316 1537
1317#END:gl_texture 1538#END:gl_texture
… …
1438 PPCODE: 1659 PPCODE:
1439 NEED_SUCCESS_ARG (cl_kernel kernel, CreateKernel, (program, SvPVbyte_nolen (function), &res)); 1660 NEED_SUCCESS_ARG (cl_kernel kernel, CreateKernel, (program, SvPVbyte_nolen (function), &res));
1440 XPUSH_NEW_OBJ ("OpenCL::Kernel", kernel); 1661 XPUSH_NEW_OBJ ("OpenCL::Kernel", kernel);
1441 1662
1442void 1663void
1664kernels_in_program (OpenCL::Program program)
1665 PPCODE:
1666 cl_uint num_kernels;
1667 NEED_SUCCESS (CreateKernelsInProgram, (program, 0, 0, &num_kernels));
1668 cl_kernel *kernels = tmpbuf (sizeof (cl_kernel) * num_kernels);
1669 NEED_SUCCESS (CreateKernelsInProgram, (program, num_kernels, kernels, 0));
1670
1671 int i;
1672 EXTEND (SP, num_kernels);
1673 for (i = 0; i < num_kernels; ++i)
1674 PUSHs (NEW_MORTAL_OBJ ("OpenCL::Kernel", kernels [i]));
1675
1676void
1443info (OpenCL::Program self, cl_program_info name) 1677info (OpenCL::Program self, cl_program_info name)
1444 PPCODE: 1678 PPCODE:
1445 INFO (Program) 1679 INFO (Program)
1446 1680
1447void 1681void
… …
1463 { 1697 {
1464 SV *sv = sv_2mortal (newSV (sizes [i])); 1698 SV *sv = sv_2mortal (newSV (sizes [i]));
1465 SvUPGRADE (sv, SVt_PV); 1699 SvUPGRADE (sv, SVt_PV);
1466 SvPOK_only (sv); 1700 SvPOK_only (sv);
1467 SvCUR_set (sv, sizes [i]); 1701 SvCUR_set (sv, sizes [i]);
1468 ptrs [i] = SvPVX (sv); 1702 ptrs [i] = (void *)SvPVX (sv);
1469 PUSHs (sv); 1703 PUSHs (sv);
1470 } 1704 }
1471 1705
1472 NEED_SUCCESS (GetProgramInfo, (self, CL_PROGRAM_BINARIES , sizeof (*ptrs ) * n, ptrs , &size)); 1706 NEED_SUCCESS (GetProgramInfo, (self, CL_PROGRAM_BINARIES , sizeof (*ptrs ) * n, ptrs , &size));
1473 if (size != sizeof (*ptrs) * n) XSRETURN_EMPTY; 1707 if (size != sizeof (*ptrs) * n) XSRETURN_EMPTY;
… …
1623set_sampler (OpenCL::Kernel self, cl_uint idx, OpenCL::Sampler value) 1857set_sampler (OpenCL::Kernel self, cl_uint idx, OpenCL::Sampler value)
1624 CODE: 1858 CODE:
1625 clSetKernelArg (self, idx, sizeof (value), &value); 1859 clSetKernelArg (self, idx, sizeof (value), &value);
1626 1860
1627void 1861void
1862set_local (OpenCL::Kernel self, cl_uint idx, size_t size)
1863 CODE:
1864 clSetKernelArg (self, idx, size, 0);
1865
1866void
1628set_event (OpenCL::Kernel self, cl_uint idx, OpenCL::Event value) 1867set_event (OpenCL::Kernel self, cl_uint idx, OpenCL::Event value)
1629 CODE: 1868 CODE:
1630 clSetKernelArg (self, idx, sizeof (value), &value); 1869 clSetKernelArg (self, idx, sizeof (value), &value);
1631 1870
1632void 1871void

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines