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

Comparing OpenCL/OpenCL.xs (file contents):
Revision 1.29 by root, Thu Apr 19 13:51:36 2012 UTC vs.
Revision 1.46 by root, Tue Apr 24 12:23:56 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;
… …
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 SV *p_sv = *av_fetch (av, i + 1, 0); 233 SV *p_sv = *av_fetch (av, i + 1, 0);
163 cl_context_properties v; 234 cl_context_properties v = SvIV (p_sv); // code below can override
164 235
165 switch (t) 236 switch (t)
166 { 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
167 default: 256 default:
168 /* unknown property, treat as int */ 257 /* unknown property, treat as int */
169 v = SvIV (p_sv);
170 break; 258 break;
171 } 259 }
172 260
173 *l++ = t; 261 *l++ = t;
174 *l++ = v; 262 *l++ = v;
… …
191 clGetImageInfo (img, CL_IMAGE_ROW_PITCH, sizeof (res), &res, 0); 279 clGetImageInfo (img, CL_IMAGE_ROW_PITCH, sizeof (res), &res, 0);
192 return res; 280 return res;
193} 281}
194 282
195static cl_event * 283static cl_event *
196event_list (SV **items, int count) 284event_list (SV **items, cl_uint *rcount)
197{ 285{
286 cl_uint count = *rcount;
287
198 if (!count) 288 if (!count)
199 return 0; 289 return 0;
200 290
201 cl_event *list = tmpbuf (sizeof (cl_event) * count); 291 cl_event *list = tmpbuf (sizeof (cl_event) * count);
292 int i = 0;
202 293
203 while (count--) 294 do
295 {
296 --count;
297 if (SvOK (items [count]))
204 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);
205 301
302 *rcount = i;
303
206 return list; 304 return i ? list : 0;
207} 305}
208 306
209#define EVENT_LIST(items,count) \ 307#define EVENT_LIST(items,count) \
210 cl_uint event_list_count = (count); \ 308 cl_uint event_list_count = (count); \
211 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)
212 310
213#define INFO(class) \ 311#define INFO(class) \
214{ \ 312{ \
215 size_t size; \ 313 size_t size; \
216 NEED_SUCCESS (Get ## class ## Info, (self, name, 0, 0, &size)); \ 314 NEED_SUCCESS (Get ## class ## Info, (self, name, 0, 0, &size)); \
… …
248} 346}
249 347
250cl_int 348cl_int
251errno () 349errno ()
252 CODE: 350 CODE:
253 errno = res; 351 RETVAL = res;
352 OUTPUT:
353 RETVAL
254 354
255const char * 355const char *
256err2str (cl_int err) 356err2str (cl_int err)
257 357
258const char * 358const char *
… …
277context_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)
278 PPCODE: 378 PPCODE:
279 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));
280 XPUSH_NEW_OBJ ("OpenCL::Context", ctx); 380 XPUSH_NEW_OBJ ("OpenCL::Context", ctx);
281 381
382#if 0
383
282void 384void
283context (cl_context_properties *properties = 0, FUTURE devices, FUTURE notify = 0) 385context (cl_context_properties *properties = 0, FUTURE devices, FUTURE notify = 0)
284 PPCODE: 386 PPCODE:
285 /* der Gipfel der Kunst */ 387 /* der Gipfel der Kunst */
388
389#endif
286 390
287void 391void
288wait_for_events (...) 392wait_for_events (...)
289 CODE: 393 CODE:
290 EVENT_LIST (0, items); 394 EVENT_LIST (0, items);
… …
405 native_vector_width_int = CL_DEVICE_NATIVE_VECTOR_WIDTH_INT 509 native_vector_width_int = CL_DEVICE_NATIVE_VECTOR_WIDTH_INT
406 native_vector_width_long = CL_DEVICE_NATIVE_VECTOR_WIDTH_LONG 510 native_vector_width_long = CL_DEVICE_NATIVE_VECTOR_WIDTH_LONG
407 native_vector_width_float = CL_DEVICE_NATIVE_VECTOR_WIDTH_FLOAT 511 native_vector_width_float = CL_DEVICE_NATIVE_VECTOR_WIDTH_FLOAT
408 native_vector_width_double = CL_DEVICE_NATIVE_VECTOR_WIDTH_DOUBLE 512 native_vector_width_double = CL_DEVICE_NATIVE_VECTOR_WIDTH_DOUBLE
409 native_vector_width_half = CL_DEVICE_NATIVE_VECTOR_WIDTH_HALF 513 native_vector_width_half = CL_DEVICE_NATIVE_VECTOR_WIDTH_HALF
410 reference_count_ext = CL_DEVICE_REFERENCE_COUNT_EXT 514 reference_count_ext = CL_DEVICE_REFERENCE_COUNT_EXT
411 PPCODE: 515 PPCODE:
412 cl_uint value [1]; 516 cl_uint value [1];
413 NEED_SUCCESS (GetDeviceInfo, (self, ix, sizeof (value), value, 0)); 517 NEED_SUCCESS (GetDeviceInfo, (self, ix, sizeof (value), value, 0));
414 EXTEND (SP, 1); 518 EXTEND (SP, 1);
415 const int i = 0; 519 const int i = 0;
… …
632 if (!(flags & (CL_MEM_USE_HOST_PTR | CL_MEM_COPY_HOST_PTR))) 736 if (!(flags & (CL_MEM_USE_HOST_PTR | CL_MEM_COPY_HOST_PTR)))
633 croak ("OpenCL::Context::buffer_sv: you have to specify use or copy host ptr when buffer data is given, use $context->buffer instead?"); 737 croak ("OpenCL::Context::buffer_sv: you have to specify use or copy host ptr when buffer data is given, use $context->buffer instead?");
634 NEED_SUCCESS_ARG (cl_mem mem, CreateBuffer, (self, flags, len, ptr, &res)); 738 NEED_SUCCESS_ARG (cl_mem mem, CreateBuffer, (self, flags, len, ptr, &res));
635 XPUSH_NEW_OBJ ("OpenCL::BufferObj", mem); 739 XPUSH_NEW_OBJ ("OpenCL::BufferObj", mem);
636 740
741#if CL_VERSION_1_2
742
637void 743void
638image2d (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) 744image (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)
639 PPCODE: 745 PPCODE:
640 STRLEN len; 746 STRLEN len;
641 char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0; 747 char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0;
642 const cl_image_format format = { channel_order, channel_type }; 748 const cl_image_format format = { channel_order, channel_type };
749 const cl_image_desc desc = {
750 type,
751 width, height, depth,
752 array_size, row_pitch, slice_pitch,
753 num_mip_level, num_samples,
754 type == CL_MEM_OBJECT_IMAGE1D_BUFFER ? (cl_mem)SvPTROBJ ("OpenCL::Context::Image", "data", data, "OpenCL::Buffer") : 0
755 };
643 NEED_SUCCESS_ARG (cl_mem mem, CreateImage2D, (self, flags, &format, width, height, row_pitch, ptr, &res)); 756 NEED_SUCCESS_ARG (cl_mem mem, CreateImage, (self, flags, &format, &desc, ptr, &res));
757 char *klass = "OpenCL::Image";
758 switch (type)
759 {
760 case CL_MEM_OBJECT_IMAGE1D_BUFFER: klass = "OpenCL::Image1DBuffer"; break;
761 case CL_MEM_OBJECT_IMAGE1D: klass = "OpenCL::Image1D"; break;
762 case CL_MEM_OBJECT_IMAGE1D_ARRAY: klass = "OpenCL::Image2DArray"; break;
763 case CL_MEM_OBJECT_IMAGE2D: klass = "OpenCL::Image2D"; break;
764 case CL_MEM_OBJECT_IMAGE2D_ARRAY: klass = "OpenCL::Image2DArray"; break;
765 case CL_MEM_OBJECT_IMAGE3D: klass = "OpenCL::Image3D"; break;
766 }
644 XPUSH_NEW_OBJ ("OpenCL::Image2D", mem); 767 XPUSH_NEW_OBJ (klass, mem);
645 768
769#endif
770
646void 771void
647image3d (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) 772image2d (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)
648 PPCODE: 773 PPCODE:
649 STRLEN len; 774 STRLEN len;
650 char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0; 775 char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0;
651 const cl_image_format format = { channel_order, channel_type }; 776 const cl_image_format format = { channel_order, channel_type };
777#if PREFER_1_1
778 NEED_SUCCESS_ARG (cl_mem mem, CreateImage2D, (self, flags, &format, width, height, row_pitch, ptr, &res));
779#else
780 const cl_image_desc desc = { CL_MEM_OBJECT_IMAGE2D, width, height, 0, 0, row_pitch, 0, 0, 0, 0 };
781 NEED_SUCCESS_ARG (cl_mem mem, CreateImage, (self, flags, &format, &desc, ptr, &res));
782#endif
783 XPUSH_NEW_OBJ ("OpenCL::Image2D", mem);
784
785void
786image3d (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)
787 PPCODE:
788 STRLEN len;
789 char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0;
790 const cl_image_format format = { channel_order, channel_type };
791#if PREFER_1_1
652 NEED_SUCCESS_ARG (cl_mem mem, CreateImage3D, (self, flags, &format, width, height, depth, row_pitch, slice_pitch, ptr, &res)); 792 NEED_SUCCESS_ARG (cl_mem mem, CreateImage3D, (self, flags, &format, width, height, depth, row_pitch, slice_pitch, ptr, &res));
793#else
794 const cl_image_desc desc = { CL_MEM_OBJECT_IMAGE3D, width, height, depth, 0, row_pitch, slice_pitch, 0, 0, 0 };
795 NEED_SUCCESS_ARG (cl_mem mem, CreateImage, (self, flags, &format, &desc, ptr, &res));
796#endif
653 XPUSH_NEW_OBJ ("OpenCL::Image3D", mem); 797 XPUSH_NEW_OBJ ("OpenCL::Image3D", mem);
654 798
655#if cl_apple_gl_sharing || cl_khr_gl_sharing 799#if cl_apple_gl_sharing || cl_khr_gl_sharing
656 800
657void 801void
… …
659 PPCODE: 803 PPCODE:
660 NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLBuffer, (self, flags, bufobj, &res)); 804 NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLBuffer, (self, flags, bufobj, &res));
661 XPUSH_NEW_OBJ ("OpenCL::BufferObj", mem); 805 XPUSH_NEW_OBJ ("OpenCL::BufferObj", mem);
662 806
663void 807void
664gl_texture2d (OpenCL::Context self, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture)
665 PPCODE:
666 NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture2D, (self, flags, target, miplevel, texture, &res));
667 XPUSH_NEW_OBJ ("OpenCL::Image2D", mem);
668
669void
670gl_texture3d (OpenCL::Context self, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture)
671 PPCODE:
672 NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture3D, (self, flags, target, miplevel, texture, &res));
673 XPUSH_NEW_OBJ ("OpenCL::Image3D", mem);
674
675void
676gl_renderbuffer (OpenCL::Context self, cl_mem_flags flags, cl_GLuint renderbuffer) 808gl_renderbuffer (OpenCL::Context self, cl_mem_flags flags, cl_GLuint renderbuffer)
677 PPCODE: 809 PPCODE:
678 NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLRenderbuffer, (self, flags, renderbuffer, &res)); 810 NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLRenderbuffer, (self, flags, renderbuffer, &res));
679 XPUSH_NEW_OBJ ("OpenCL::Image2D", mem); 811 XPUSH_NEW_OBJ ("OpenCL::Image2D", mem);
812
813#if CL_VERSION_1_2
814
815void
816gl_texture (OpenCL::Context self, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture)
817 ALIAS:
818 PPCODE:
819 NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture, (self, flags, target, miplevel, texture, &res));
820 cl_gl_object_type type;
821 NEED_SUCCESS (GetGLObjectInfo, (mem, &type, 0)); // TODO: use target instead?
822 char *klass = "OpenCL::Memory";
823 switch (type)
824 {
825 case CL_GL_OBJECT_TEXTURE_BUFFER: klass = "OpenCL::Image1DBuffer"; break;
826 case CL_GL_OBJECT_TEXTURE1D: klass = "OpenCL::Image1D"; break;
827 case CL_GL_OBJECT_TEXTURE1D_ARRAY: klass = "OpenCL::Image2DArray"; break;
828 case CL_GL_OBJECT_TEXTURE2D: klass = "OpenCL::Image2D"; break;
829 case CL_GL_OBJECT_TEXTURE2D_ARRAY: klass = "OpenCL::Image2DArray"; break;
830 case CL_GL_OBJECT_TEXTURE3D: klass = "OpenCL::Image3D"; break;
831 }
832 XPUSH_NEW_OBJ (klass, mem);
833
834#endif
835
836void
837gl_texture2d (OpenCL::Context self, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture)
838 PPCODE:
839#if PREFER_1_1
840 NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture2D, (self, flags, target, miplevel, texture, &res));
841#else
842 NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture , (self, flags, target, miplevel, texture, &res));
843#endif
844 XPUSH_NEW_OBJ ("OpenCL::Image2D", mem);
845
846void
847gl_texture3d (OpenCL::Context self, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture)
848 PPCODE:
849#if PREFER_1_1
850 NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture3D, (self, flags, target, miplevel, texture, &res));
851#else
852 NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture , (self, flags, target, miplevel, texture, &res));
853#endif
854 XPUSH_NEW_OBJ ("OpenCL::Image3D", mem);
680 855
681#endif 856#endif
682 857
683void 858void
684supported_image_formats (OpenCL::Context self, cl_mem_flags flags, cl_mem_object_type image_type) 859supported_image_formats (OpenCL::Context self, cl_mem_flags flags, cl_mem_object_type image_type)
… …
789 cl_event ev = 0; 964 cl_event ev = 0;
790 STRLEN len; 965 STRLEN len;
791 char *ptr = SvPVbyte (data, len); 966 char *ptr = SvPVbyte (data, len);
792 EVENT_LIST (5, items - 5); 967 EVENT_LIST (5, items - 5);
793 968
794 NEED_SUCCESS (EnqueueReadBuffer, (self, mem, blocking, offset, len, ptr, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0)); 969 NEED_SUCCESS (EnqueueWriteBuffer, (self, mem, blocking, offset, len, ptr, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0));
795 970
796 if (ev) 971 if (ev)
797 XPUSH_NEW_OBJ ("OpenCL::Event", ev); 972 XPUSH_NEW_OBJ ("OpenCL::Event", ev);
798 973
799void 974void
… …
865 size_t min_len = host_row_pitch * host_slice_pitch * region [2]; 1040 size_t min_len = host_row_pitch * host_slice_pitch * region [2];
866 1041
867 if (len < min_len) 1042 if (len < min_len)
868 croak ("clEnqueueWriteImage: data string is shorter than what would be transferred"); 1043 croak ("clEnqueueWriteImage: data string is shorter than what would be transferred");
869 1044
870 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)); 1045 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));
871 1046
872 if (ev) 1047 if (ev)
873 XPUSH_NEW_OBJ ("OpenCL::Event", ev); 1048 XPUSH_NEW_OBJ ("OpenCL::Event", ev);
874 1049
875void 1050void
… …
930 size_t min_len = slice_pitch ? slice_pitch * depth : row_pitch * height; 1105 size_t min_len = slice_pitch ? slice_pitch * depth : row_pitch * height;
931 1106
932 if (len < min_len) 1107 if (len < min_len)
933 croak ("clEnqueueWriteImage: data string is shorter than what would be transferred"); 1108 croak ("clEnqueueWriteImage: data string is shorter than what would be transferred");
934 1109
935 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)); 1110 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));
936 1111
937 if (ev) 1112 if (ev)
938 XPUSH_NEW_OBJ ("OpenCL::Event", ev); 1113 XPUSH_NEW_OBJ ("OpenCL::Event", ev);
939 1114
940void 1115void
… …
1022 gwo [i] = SvIV (AvARRAY (SvRV (global_work_offset))[i]); 1197 gwo [i] = SvIV (AvARRAY (SvRV (global_work_offset))[i]);
1023 } 1198 }
1024 1199
1025 if (SvOK (local_work_size)) 1200 if (SvOK (local_work_size))
1026 { 1201 {
1027 if (SvOK (local_work_size) && !SvROK (local_work_size) || SvTYPE (SvRV (local_work_size)) != SVt_PVAV) 1202 if ((SvOK (local_work_size) && !SvROK (local_work_size)) || SvTYPE (SvRV (local_work_size)) != SVt_PVAV)
1028 croak ("clEnqueueNDRangeKernel: global_work_size must be undef or an array reference"); 1203 croak ("clEnqueueNDRangeKernel: global_work_size must be undef or an array reference");
1029 1204
1030 if (AvFILLp (SvRV (local_work_size)) + 1 != gws_len) 1205 if (AvFILLp (SvRV (local_work_size)) + 1 != gws_len)
1031 croak ("clEnqueueNDRangeKernel: local_work_local must be undef or an array of same size as global_work_size"); 1206 croak ("clEnqueueNDRangeKernel: local_work_local must be undef or an array of same size as global_work_size");
1032 1207
… …
1044 1219
1045void 1220void
1046enqueue_acquire_gl_objects (OpenCL::Queue self, SV *objects, ...) 1221enqueue_acquire_gl_objects (OpenCL::Queue self, SV *objects, ...)
1047 ALIAS: 1222 ALIAS:
1048 enqueue_release_gl_objects = 1 1223 enqueue_release_gl_objects = 1
1049 CODE: 1224 PPCODE:
1050 if (!SvROK (objects) || SvTYPE (SvRV (objects)) != SVt_PVAV) 1225 if (!SvROK (objects) || SvTYPE (SvRV (objects)) != SVt_PVAV)
1051 croak ("OpenCL::Queue::enqueue_acquire/release_gl_objects argument 'objects' must be an arrayref with memory objects, in call"); 1226 croak ("OpenCL::Queue::enqueue_acquire/release_gl_objects argument 'objects' must be an arrayref with memory objects, in call");
1052 1227
1053 cl_event ev = 0; 1228 cl_event ev = 0;
1054 EVENT_LIST (2, items - 2); 1229 EVENT_LIST (2, items - 2);
… …
1068 if (ev) 1243 if (ev)
1069 XPUSH_NEW_OBJ ("OpenCL::Event", ev); 1244 XPUSH_NEW_OBJ ("OpenCL::Event", ev);
1070 1245
1071#endif 1246#endif
1072 1247
1073void 1248#if !CL_VERSION_1_2 || defined CL_USE_DEPRECATED_OPENCL_1_1_APIS
1074enqueue_marker (OpenCL::Queue self)
1075 PPCODE:
1076 cl_event ev;
1077 NEED_SUCCESS (EnqueueMarker, (self, &ev));
1078 XPUSH_NEW_OBJ ("OpenCL::Event", ev);
1079 1249
1080void 1250void
1081enqueue_wait_for_events (OpenCL::Queue self, ...) 1251enqueue_wait_for_events (OpenCL::Queue self, ...)
1082 CODE: 1252 CODE:
1083 EVENT_LIST (1, items - 1); 1253 EVENT_LIST (1, items - 1);
1084 NEED_SUCCESS (EnqueueWaitForEvents, (self, event_list_count, event_list_ptr)); 1254 NEED_SUCCESS (EnqueueWaitForEvents, (self, event_list_count, event_list_ptr));
1085 1255
1256#endif
1257
1086void 1258void
1259enqueue_marker (OpenCL::Queue self, ...)
1260 PPCODE:
1261 cl_event ev = 0;
1262 EVENT_LIST (1, items - 1);
1263#if PREFER_1_1
1264#if CL_VERSION_1_2
1265 if (event_list_count)
1266 NEED_SUCCESS (EnqueueMarkerWithWaitList, (self, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0));
1267 else
1268 NEED_SUCCESS (EnqueueMarker, (self, GIMME_V != G_VOID ? &ev : 0));
1269#else
1270 if (event_list_count)
1271 croak ("OpenCL::Queue->enqueue_marker does not support a wait list in OpenCL 1.1 - upgrade to 1.2");
1272 NEED_SUCCESS (EnqueueMarker, (self, GIMME_V != G_VOID ? &ev : 0));
1273#endif
1274#else
1275 NEED_SUCCESS (EnqueueMarkerWithWaitList, (self, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0));
1276#endif
1277 if (ev)
1278 XPUSH_NEW_OBJ ("OpenCL::Event", ev);
1279
1280void
1087enqueue_barrier (OpenCL::Queue self) 1281enqueue_barrier (OpenCL::Queue self, ...)
1088 CODE: 1282 PPCODE:
1283 cl_event ev = 0;
1284 EVENT_LIST (1, items - 1);
1285#if PREFER_1_1
1286#if CL_VERSION_1_2
1287 if (event_list_count || GIMME_V != G_VOID)
1288 NEED_SUCCESS (EnqueueBarrierWithWaitList, (self, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0));
1289 else
1290 NEED_SUCCESS (EnqueueBarrier, (self));
1291#else
1292 if (event_list_count)
1293 croak ("OpenCL::Queue->enqueue_barrier does not support a wait list in OpenCL 1.1 - upgrade to 1.2");
1294 if (GIMME_V != G_VOID)
1295 croak ("OpenCL::Queue->enqueue_barrier does not return an event object in OpenCL 1.1 - upgrade to 1.2");
1089 NEED_SUCCESS (EnqueueBarrier, (self)); 1296 NEED_SUCCESS (EnqueueBarrier, (self));
1297#endif
1298#else
1299 NEED_SUCCESS (EnqueueBarrierWithWaitList, (self, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0));
1300#endif
1301 if (ev)
1302 XPUSH_NEW_OBJ ("OpenCL::Event", ev);
1090 1303
1091void 1304void
1092flush (OpenCL::Queue self) 1305flush (OpenCL::Queue self)
1093 CODE: 1306 CODE:
1094 NEED_SUCCESS (Flush, (self)); 1307 NEED_SUCCESS (Flush, (self));
… …
1244void 1457void
1245gl_object_info (OpenCL::Memory self) 1458gl_object_info (OpenCL::Memory self)
1246 PPCODE: 1459 PPCODE:
1247 cl_gl_object_type type; 1460 cl_gl_object_type type;
1248 cl_GLuint name; 1461 cl_GLuint name;
1249 NEED_SUCCESS (clGetGLObjectInfo, (self, &type, &name)); 1462 NEED_SUCCESS (GetGLObjectInfo, (self, &type, &name));
1250 EXTEND (SP, 2); 1463 EXTEND (SP, 2);
1251 PUSHs (sv_2mortal (newSVuv (type))); 1464 PUSHs (sv_2mortal (newSVuv (type)));
1252 PUSHs (sv_2mortal (newSVuv (name))); 1465 PUSHs (sv_2mortal (newSVuv (name)));
1253 1466
1254#endif 1467#endif
… …
1299 1512
1300void 1513void
1301target (OpenCL::Image self) 1514target (OpenCL::Image self)
1302 PPCODE: 1515 PPCODE:
1303 cl_GLenum value [1]; 1516 cl_GLenum value [1];
1304 NEED_SUCCESS (GetGlTextureInfo, (self, CL_GL_TEXTURE_TARGET, sizeof (value), value, 0)); 1517 NEED_SUCCESS (GetGLTextureInfo, (self, CL_GL_TEXTURE_TARGET, sizeof (value), value, 0));
1305 EXTEND (SP, 1); 1518 EXTEND (SP, 1);
1306 const int i = 0; 1519 const int i = 0;
1307 PUSHs (sv_2mortal (newSVuv (value [i]))); 1520 PUSHs (sv_2mortal (newSVuv (value [i])));
1308 1521
1309void 1522void
1310gl_mipmap_level (OpenCL::Image self) 1523gl_mipmap_level (OpenCL::Image self)
1311 PPCODE: 1524 PPCODE:
1312 cl_GLint value [1]; 1525 cl_GLint value [1];
1313 NEED_SUCCESS (GetGlTextureInfo, (self, CL_GL_MIPMAP_LEVEL, sizeof (value), value, 0)); 1526 NEED_SUCCESS (GetGLTextureInfo, (self, CL_GL_MIPMAP_LEVEL, sizeof (value), value, 0));
1314 EXTEND (SP, 1); 1527 EXTEND (SP, 1);
1315 const int i = 0; 1528 const int i = 0;
1316 PUSHs (sv_2mortal (newSViv (value [i]))); 1529 PUSHs (sv_2mortal (newSViv (value [i])));
1317 1530
1318#END:gl_texture 1531#END:gl_texture
… …
1464 { 1677 {
1465 SV *sv = sv_2mortal (newSV (sizes [i])); 1678 SV *sv = sv_2mortal (newSV (sizes [i]));
1466 SvUPGRADE (sv, SVt_PV); 1679 SvUPGRADE (sv, SVt_PV);
1467 SvPOK_only (sv); 1680 SvPOK_only (sv);
1468 SvCUR_set (sv, sizes [i]); 1681 SvCUR_set (sv, sizes [i]);
1469 ptrs [i] = SvPVX (sv); 1682 ptrs [i] = (void *)SvPVX (sv);
1470 PUSHs (sv); 1683 PUSHs (sv);
1471 } 1684 }
1472 1685
1473 NEED_SUCCESS (GetProgramInfo, (self, CL_PROGRAM_BINARIES , sizeof (*ptrs ) * n, ptrs , &size)); 1686 NEED_SUCCESS (GetProgramInfo, (self, CL_PROGRAM_BINARIES , sizeof (*ptrs ) * n, ptrs , &size));
1474 if (size != sizeof (*ptrs) * n) XSRETURN_EMPTY; 1687 if (size != sizeof (*ptrs) * n) XSRETURN_EMPTY;
… …
1624set_sampler (OpenCL::Kernel self, cl_uint idx, OpenCL::Sampler value) 1837set_sampler (OpenCL::Kernel self, cl_uint idx, OpenCL::Sampler value)
1625 CODE: 1838 CODE:
1626 clSetKernelArg (self, idx, sizeof (value), &value); 1839 clSetKernelArg (self, idx, sizeof (value), &value);
1627 1840
1628void 1841void
1842set_local (OpenCL::Kernel self, cl_uint idx, size_t size)
1843 CODE:
1844 clSetKernelArg (self, idx, size, 0);
1845
1846void
1629set_event (OpenCL::Kernel self, cl_uint idx, OpenCL::Event value) 1847set_event (OpenCL::Kernel self, cl_uint idx, OpenCL::Event value)
1630 CODE: 1848 CODE:
1631 clSetKernelArg (self, idx, sizeof (value), &value); 1849 clSetKernelArg (self, idx, sizeof (value), &value);
1632 1850
1633void 1851void

Diff Legend

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