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.41 by root, Sat Apr 21 19:53:29 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_1_APIS
17#define CL_USE_DEPRECATED_OPENCL_1_2_APIS /* just guessing, you stupid idiots */
4 18
5#ifdef __APPLE__ 19#ifdef __APPLE__
6 #include <OpenCL/opencl.h> 20 #include <OpenCL/opencl.h>
7#else 21#else
8 #include <CL/opencl.h> 22 #include <CL/opencl.h>
23#endif
24
25#if 0 // testing
26#undef CL_USE_DEPRECATED_OPENCL_1_1_APIS
27#undef CL_VERSION_1_2
9#endif 28#endif
10 29
11typedef cl_platform_id OpenCL__Platform; 30typedef cl_platform_id OpenCL__Platform;
12typedef cl_device_id OpenCL__Device; 31typedef cl_device_id OpenCL__Device;
13typedef cl_context OpenCL__Context; 32typedef cl_context OpenCL__Context;
… …
31 50
32typedef SV *FUTURE; 51typedef SV *FUTURE;
33 52
34/*****************************************************************************/ 53/*****************************************************************************/
35 54
55// name must include a leading underscore
56// all of this horrors would be unneceesary if somebody wrote a proper OpenGL module
57// for perl. doh.
58static void *
59glsym (const char *name)
60{
61 void *fun = 0;
62
63 #if defined I_DLFCN && defined RTLD_DEFAULT
64 fun = dlsym (RTLD_DEFAULT, name + 1);
65 if (!fun) fun = dlsym (RTLD_DEFAULT, name);
66
67 if (!fun)
68 {
69 static void *libgl;
70 static const char *glso[] = {
71 "libGL.so.1",
72 "libGL.so.3",
73 "libGL.so.4.0",
74 "libGL.so",
75 "/usr/lib/libGL.so",
76 "/usr/X11R6/lib/libGL.1.dylib"
77 };
78 int i;
79
80 for (i = 0; !libgl && i < sizeof (glso) / sizeof (glso [0]); ++i)
81 {
82 libgl = dlopen (glso [i], RTLD_LAZY);
83 if (libgl)
84 break;
85 }
86
87 if (libgl)
88 {
89 fun = dlsym (libgl, name + 1);
90 if (!fun) fun = dlsym (libgl, name);
91 }
92 }
93 #endif
94
95 return fun;
96}
97
98/*****************************************************************************/
99
36/* up to two temporary buffers */ 100/* up to two temporary buffers */
37static void * 101static void *
38tmpbuf (size_t size) 102tmpbuf (size_t size)
39{ 103{
40 enum { buffers = 3 }; 104 enum { buffers = 3 };
41 static int idx; 105 static int idx;
42 static void *buf [buffers]; 106 static void *buf [buffers];
43 static size_t len [buffers]; 107 static size_t len [buffers];
44 108
45 idx = ++idx % buffers; 109 idx = (idx + 1) % buffers;
46 110
47 if (len [idx] < size) 111 if (len [idx] < size)
48 { 112 {
49 free (buf [idx]); 113 free (buf [idx]);
50 len [idx] = ((size + 31) & ~4095) + 4096 - 32; 114 len [idx] = ((size + 31) & ~4095) + 4096 - 32;
… …
144 return 0; 208 return 0;
145 209
146 if (SvROK (sv) && SvTYPE (SvRV (sv)) == SVt_PVAV) 210 if (SvROK (sv) && SvTYPE (SvRV (sv)) == SVt_PVAV)
147 { 211 {
148 AV *av = (AV *)SvRV (sv); 212 AV *av = (AV *)SvRV (sv);
149 int i, len = av_len (av); 213 int i, len = av_len (av) + 1;
150 cl_context_properties *p = tmpbuf (sizeof (cl_context_properties) * (len + extracount + 1)); 214 cl_context_properties *p = tmpbuf (sizeof (cl_context_properties) * (len + extracount + 1));
151 cl_context_properties *l = p; 215 cl_context_properties *l = p;
152 216
153 if (len & 1) 217 if (len & 1)
154 croak ("%s: %s is not a property list (must be even number of elements)", func, svname); 218 croak ("%s: %s is not a property list (must be even number of elements)", func, svname);
… …
156 while (extracount--) 220 while (extracount--)
157 *l++ = *extra++; 221 *l++ = *extra++;
158 222
159 for (i = 0; i < len; i += 2) 223 for (i = 0; i < len; i += 2)
160 { 224 {
161 cl_context_properties t = SvIV (*av_fetch (av, i, 0)); 225 cl_context_properties t = SvIV (*av_fetch (av, i , 0));
162 cl_context_properties v; 226 SV *p_sv = *av_fetch (av, i + 1, 0);
227 cl_context_properties v = SvIV (p_sv); // code below can override
163 228
164 switch (t) 229 switch (t)
165 { 230 {
231 case CL_GLX_DISPLAY_KHR:
232 if (!SvOK (p_sv))
233 {
234 void *func = glsym ("_glXGetCurrentDisplay");
235 if (func)
236 v = (cl_context_properties)((void *(*)(void))func)();
237 }
238 break;
239
240 case CL_GL_CONTEXT_KHR:
241 if (!SvOK (p_sv))
242 {
243 void *func = glsym ("_glXGetCurrentContext");
244 if (func)
245 v = (cl_context_properties)((void *(*)(void))func)();
246 }
247 break;
248
166 default: 249 default:
167 /* unknown property, treat as int */ 250 /* unknown property, treat as int */
168 v = SvIV (*av_fetch (av, i, 0));
169 break; 251 break;
170 } 252 }
171 253
172 *l++ = t; 254 *l++ = t;
173 *l++ = v; 255 *l++ = v;
… …
190 clGetImageInfo (img, CL_IMAGE_ROW_PITCH, sizeof (res), &res, 0); 272 clGetImageInfo (img, CL_IMAGE_ROW_PITCH, sizeof (res), &res, 0);
191 return res; 273 return res;
192} 274}
193 275
194static cl_event * 276static cl_event *
195event_list (SV **items, int count) 277event_list (SV **items, cl_uint *rcount)
196{ 278{
279 cl_uint count = *rcount;
280
197 if (!count) 281 if (!count)
198 return 0; 282 return 0;
199 283
200 cl_event *list = tmpbuf (sizeof (cl_event) * count); 284 cl_event *list = tmpbuf (sizeof (cl_event) * count);
285 int i = 0;
201 286
202 while (count--) 287 do
288 {
289 --count;
290 if (SvOK (items [count]))
203 list [count] = SvPTROBJ ("clEnqueue", "wait_events", items [count], "OpenCL::Event"); 291 list [i++] = SvPTROBJ ("clEnqueue", "wait_events", items [count], "OpenCL::Event");
292 }
293 while (count);
204 294
295 *rcount = i;
296
205 return list; 297 return i ? list : 0;
206} 298}
207 299
208#define EVENT_LIST(items,count) \ 300#define EVENT_LIST(items,count) \
209 cl_uint event_list_count = (count); \ 301 cl_uint event_list_count = (count); \
210 cl_event *event_list_ptr = event_list (&ST (items), event_list_count) 302 cl_event *event_list_ptr = event_list (&ST (items), &event_list_count)
211 303
212#define INFO(class) \ 304#define INFO(class) \
213{ \ 305{ \
214 size_t size; \ 306 size_t size; \
215 NEED_SUCCESS (Get ## class ## Info, (self, name, 0, 0, &size)); \ 307 NEED_SUCCESS (Get ## class ## Info, (self, name, 0, 0, &size)); \
… …
247} 339}
248 340
249cl_int 341cl_int
250errno () 342errno ()
251 CODE: 343 CODE:
252 errno = res; 344 RETVAL = res;
345 OUTPUT:
346 RETVAL
253 347
254const char * 348const char *
255err2str (cl_int err) 349err2str (cl_int err)
256 350
257const char * 351const char *
… …
276context_from_type (cl_context_properties *properties = 0, cl_device_type type = CL_DEVICE_TYPE_DEFAULT, FUTURE notify = 0) 370context_from_type (cl_context_properties *properties = 0, cl_device_type type = CL_DEVICE_TYPE_DEFAULT, FUTURE notify = 0)
277 PPCODE: 371 PPCODE:
278 NEED_SUCCESS_ARG (cl_context ctx, CreateContextFromType, (properties, type, 0, 0, &res)); 372 NEED_SUCCESS_ARG (cl_context ctx, CreateContextFromType, (properties, type, 0, 0, &res));
279 XPUSH_NEW_OBJ ("OpenCL::Context", ctx); 373 XPUSH_NEW_OBJ ("OpenCL::Context", ctx);
280 374
375#if 0
376
281void 377void
282context (cl_context_properties *properties = 0, FUTURE devices, FUTURE notify = 0) 378context (cl_context_properties *properties = 0, FUTURE devices, FUTURE notify = 0)
283 PPCODE: 379 PPCODE:
284 /* der Gipfel der Kunst */ 380 /* der Gipfel der Kunst */
381
382#endif
285 383
286void 384void
287wait_for_events (...) 385wait_for_events (...)
288 CODE: 386 CODE:
289 EVENT_LIST (0, items); 387 EVENT_LIST (0, items);
… …
404 native_vector_width_int = CL_DEVICE_NATIVE_VECTOR_WIDTH_INT 502 native_vector_width_int = CL_DEVICE_NATIVE_VECTOR_WIDTH_INT
405 native_vector_width_long = CL_DEVICE_NATIVE_VECTOR_WIDTH_LONG 503 native_vector_width_long = CL_DEVICE_NATIVE_VECTOR_WIDTH_LONG
406 native_vector_width_float = CL_DEVICE_NATIVE_VECTOR_WIDTH_FLOAT 504 native_vector_width_float = CL_DEVICE_NATIVE_VECTOR_WIDTH_FLOAT
407 native_vector_width_double = CL_DEVICE_NATIVE_VECTOR_WIDTH_DOUBLE 505 native_vector_width_double = CL_DEVICE_NATIVE_VECTOR_WIDTH_DOUBLE
408 native_vector_width_half = CL_DEVICE_NATIVE_VECTOR_WIDTH_HALF 506 native_vector_width_half = CL_DEVICE_NATIVE_VECTOR_WIDTH_HALF
409 reference_count_ext = CL_DEVICE_REFERENCE_COUNT_EXT 507 reference_count_ext = CL_DEVICE_REFERENCE_COUNT_EXT
410 PPCODE: 508 PPCODE:
411 cl_uint value [1]; 509 cl_uint value [1];
412 NEED_SUCCESS (GetDeviceInfo, (self, ix, sizeof (value), value, 0)); 510 NEED_SUCCESS (GetDeviceInfo, (self, ix, sizeof (value), value, 0));
413 EXTEND (SP, 1); 511 EXTEND (SP, 1);
414 const int i = 0; 512 const int i = 0;
… …
631 if (!(flags & (CL_MEM_USE_HOST_PTR | CL_MEM_COPY_HOST_PTR))) 729 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?"); 730 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)); 731 NEED_SUCCESS_ARG (cl_mem mem, CreateBuffer, (self, flags, len, ptr, &res));
634 XPUSH_NEW_OBJ ("OpenCL::BufferObj", mem); 732 XPUSH_NEW_OBJ ("OpenCL::BufferObj", mem);
635 733
734#if !CL_VERSION_1_2 || defined CL_USE_DEPRECATED_OPENCL_1_1_APIS
735
636void 736void
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) 737image2d (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)
638 PPCODE: 738 PPCODE:
639 STRLEN len; 739 STRLEN len;
640 char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0; 740 char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0;
… …
649 char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0; 749 char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0;
650 const cl_image_format format = { channel_order, channel_type }; 750 const cl_image_format format = { channel_order, channel_type };
651 NEED_SUCCESS_ARG (cl_mem mem, CreateImage3D, (self, flags, &format, width, height, depth, row_pitch, slice_pitch, ptr, &res)); 751 NEED_SUCCESS_ARG (cl_mem mem, CreateImage3D, (self, flags, &format, width, height, depth, row_pitch, slice_pitch, ptr, &res));
652 XPUSH_NEW_OBJ ("OpenCL::Image3D", mem); 752 XPUSH_NEW_OBJ ("OpenCL::Image3D", mem);
653 753
754#endif
755
654#if cl_apple_gl_sharing || cl_khr_gl_sharing 756#if cl_apple_gl_sharing || cl_khr_gl_sharing
655 757
656void 758void
657gl_buffer (OpenCL::Context self, cl_mem_flags flags, cl_GLuint bufobj) 759gl_buffer (OpenCL::Context self, cl_mem_flags flags, cl_GLuint bufobj)
658 PPCODE: 760 PPCODE:
659 NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLBuffer, (self, flags, bufobj, &res)); 761 NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLBuffer, (self, flags, bufobj, &res));
660 XPUSH_NEW_OBJ ("OpenCL::BufferObj", mem); 762 XPUSH_NEW_OBJ ("OpenCL::BufferObj", mem);
661 763
662void 764void
765gl_renderbuffer (OpenCL::Context self, cl_mem_flags flags, cl_GLuint renderbuffer)
766 PPCODE:
767 NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLRenderbuffer, (self, flags, renderbuffer, &res));
768 XPUSH_NEW_OBJ ("OpenCL::Image2D", mem);
769
770#if CL_VERSION_1_2
771
772void
773gl_texture (OpenCL::Context self, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture)
774 PPCODE:
775 char *klass = "OpenCL::Memory";
776 cl_gl_object_type t;
777 NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture2D, (self, flags, target, miplevel, texture, &res));
778 NEED_SUCCESS (GetGLObjectInfo, (mem, &t, 0));
779 switch (t)
780 {
781 case CL_GL_OBJECT_TEXTURE_BUFFER: klass = "OpenCL::Image1DBuffer"; break;
782 case CL_GL_OBJECT_TEXTURE1D: klass = "OpenCL::Image1D"; break;
783 case CL_GL_OBJECT_TEXTURE1D_ARRAY: klass = "OpenCL::Image2DArray"; break;
784 case CL_GL_OBJECT_TEXTURE2D: klass = "OpenCL::Image2D"; break;
785 case CL_GL_OBJECT_TEXTURE2D_ARRAY: klass = "OpenCL::Image2DArray"; break;
786 case CL_GL_OBJECT_TEXTURE3D: klass = "OpenCL::Image3D"; break;
787 }
788 XPUSH_NEW_OBJ (klass, mem);
789
790#endif
791
792#if !CL_VERSION_1_2 || defined CL_USE_DEPRECATED_OPENCL_1_1_APIS
793
794void
663gl_texture2d (OpenCL::Context self, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture) 795gl_texture2d (OpenCL::Context self, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture)
664 PPCODE: 796 PPCODE:
665 NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture2D, (self, flags, target, miplevel, texture, &res)); 797 NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture2D, (self, flags, target, miplevel, texture, &res));
666 XPUSH_NEW_OBJ ("OpenCL::Image2D", mem); 798 XPUSH_NEW_OBJ ("OpenCL::Image2D", mem);
667 799
… …
669gl_texture3d (OpenCL::Context self, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture) 801gl_texture3d (OpenCL::Context self, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture)
670 PPCODE: 802 PPCODE:
671 NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture3D, (self, flags, target, miplevel, texture, &res)); 803 NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture3D, (self, flags, target, miplevel, texture, &res));
672 XPUSH_NEW_OBJ ("OpenCL::Image3D", mem); 804 XPUSH_NEW_OBJ ("OpenCL::Image3D", mem);
673 805
674void 806#endif
675gl_renderbuffer (OpenCL::Context self, cl_mem_flags flags, cl_GLuint renderbuffer)
676 PPCODE:
677 NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLRenderbuffer, (self, flags, renderbuffer, &res));
678 XPUSH_NEW_OBJ ("OpenCL::Image2D", mem);
679 807
680#endif 808#endif
681 809
682void 810void
683supported_image_formats (OpenCL::Context self, cl_mem_flags flags, cl_mem_object_type image_type) 811supported_image_formats (OpenCL::Context self, cl_mem_flags flags, cl_mem_object_type image_type)
… …
788 cl_event ev = 0; 916 cl_event ev = 0;
789 STRLEN len; 917 STRLEN len;
790 char *ptr = SvPVbyte (data, len); 918 char *ptr = SvPVbyte (data, len);
791 EVENT_LIST (5, items - 5); 919 EVENT_LIST (5, items - 5);
792 920
793 NEED_SUCCESS (EnqueueReadBuffer, (self, mem, blocking, offset, len, ptr, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0)); 921 NEED_SUCCESS (EnqueueWriteBuffer, (self, mem, blocking, offset, len, ptr, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0));
794 922
795 if (ev) 923 if (ev)
796 XPUSH_NEW_OBJ ("OpenCL::Event", ev); 924 XPUSH_NEW_OBJ ("OpenCL::Event", ev);
797 925
798void 926void
… …
864 size_t min_len = host_row_pitch * host_slice_pitch * region [2]; 992 size_t min_len = host_row_pitch * host_slice_pitch * region [2];
865 993
866 if (len < min_len) 994 if (len < min_len)
867 croak ("clEnqueueWriteImage: data string is shorter than what would be transferred"); 995 croak ("clEnqueueWriteImage: data string is shorter than what would be transferred");
868 996
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)); 997 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 998
871 if (ev) 999 if (ev)
872 XPUSH_NEW_OBJ ("OpenCL::Event", ev); 1000 XPUSH_NEW_OBJ ("OpenCL::Event", ev);
873 1001
874void 1002void
… …
929 size_t min_len = slice_pitch ? slice_pitch * depth : row_pitch * height; 1057 size_t min_len = slice_pitch ? slice_pitch * depth : row_pitch * height;
930 1058
931 if (len < min_len) 1059 if (len < min_len)
932 croak ("clEnqueueWriteImage: data string is shorter than what would be transferred"); 1060 croak ("clEnqueueWriteImage: data string is shorter than what would be transferred");
933 1061
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)); 1062 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 1063
936 if (ev) 1064 if (ev)
937 XPUSH_NEW_OBJ ("OpenCL::Event", ev); 1065 XPUSH_NEW_OBJ ("OpenCL::Event", ev);
938 1066
939void 1067void
… …
1021 gwo [i] = SvIV (AvARRAY (SvRV (global_work_offset))[i]); 1149 gwo [i] = SvIV (AvARRAY (SvRV (global_work_offset))[i]);
1022 } 1150 }
1023 1151
1024 if (SvOK (local_work_size)) 1152 if (SvOK (local_work_size))
1025 { 1153 {
1026 if (SvOK (local_work_size) && !SvROK (local_work_size) || SvTYPE (SvRV (local_work_size)) != SVt_PVAV) 1154 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"); 1155 croak ("clEnqueueNDRangeKernel: global_work_size must be undef or an array reference");
1028 1156
1029 if (AvFILLp (SvRV (local_work_size)) + 1 != gws_len) 1157 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"); 1158 croak ("clEnqueueNDRangeKernel: local_work_local must be undef or an array of same size as global_work_size");
1031 1159
… …
1043 1171
1044void 1172void
1045enqueue_acquire_gl_objects (OpenCL::Queue self, SV *objects, ...) 1173enqueue_acquire_gl_objects (OpenCL::Queue self, SV *objects, ...)
1046 ALIAS: 1174 ALIAS:
1047 enqueue_release_gl_objects = 1 1175 enqueue_release_gl_objects = 1
1048 CODE: 1176 PPCODE:
1049 if (!SvROK (objects) || SvTYPE (SvRV (objects)) != SVt_PVAV) 1177 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"); 1178 croak ("OpenCL::Queue::enqueue_acquire/release_gl_objects argument 'objects' must be an arrayref with memory objects, in call");
1051 1179
1052 cl_event ev = 0; 1180 cl_event ev = 0;
1053 EVENT_LIST (2, items - 2); 1181 EVENT_LIST (2, items - 2);
… …
1067 if (ev) 1195 if (ev)
1068 XPUSH_NEW_OBJ ("OpenCL::Event", ev); 1196 XPUSH_NEW_OBJ ("OpenCL::Event", ev);
1069 1197
1070#endif 1198#endif
1071 1199
1072void 1200#if !CL_VERSION_1_2 || defined CL_USE_DEPRECATED_OPENCL_1_1_APIS
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 1201
1079void 1202void
1080enqueue_wait_for_events (OpenCL::Queue self, ...) 1203enqueue_wait_for_events (OpenCL::Queue self, ...)
1081 CODE: 1204 CODE:
1082 EVENT_LIST (1, items - 1); 1205 EVENT_LIST (1, items - 1);
1083 NEED_SUCCESS (EnqueueWaitForEvents, (self, event_list_count, event_list_ptr)); 1206 NEED_SUCCESS (EnqueueWaitForEvents, (self, event_list_count, event_list_ptr));
1084 1207
1208#endif
1209
1085void 1210void
1211enqueue_marker (OpenCL::Queue self, ...)
1212 PPCODE:
1213 cl_event ev = 0;
1214 EVENT_LIST (1, items - 1);
1215#if CL_VERSION_1_2
1216 NEED_SUCCESS (EnqueueMarkerWithWaitList, (self, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0));
1217#else
1218 if (event_list_count)
1219 croak ("OpenCL::Queue->enqueue_marker does not support a wait list in OpenCL 1.1 - upgrade to 1.2");
1220 NEED_SUCCESS (EnqueueMarker, (self, GIMME_V != G_VOID ? &ev : 0));
1221#endif
1222 if (ev)
1223 XPUSH_NEW_OBJ ("OpenCL::Event", ev);
1224
1225void
1086enqueue_barrier (OpenCL::Queue self) 1226enqueue_barrier (OpenCL::Queue self, ...)
1087 CODE: 1227 PPCODE:
1228 cl_event ev = 0;
1229 EVENT_LIST (1, items - 1);
1230#if CL_VERSION_1_2
1231 NEED_SUCCESS (EnqueueBarrierWithWaitList, (self, event_list_count, event_list_ptr, &ev));
1232#else
1233 if (event_list_count)
1234 croak ("OpenCL::Queue->enqueue_barrier does not support a wait list in OpenCL 1.1 - upgrade to 1.2");
1235 if (GIMME_V != G_VOID)
1236 croak ("OpenCL::Queue->enqueue_barrier does not return an event object in OpenCL 1.1 - upgrade to 1.2");
1088 NEED_SUCCESS (EnqueueBarrier, (self)); 1237 NEED_SUCCESS (EnqueueBarrier, (self));
1238#endif
1239 if (ev)
1240 XPUSH_NEW_OBJ ("OpenCL::Event", ev);
1089 1241
1090void 1242void
1091flush (OpenCL::Queue self) 1243flush (OpenCL::Queue self)
1092 CODE: 1244 CODE:
1093 NEED_SUCCESS (Flush, (self)); 1245 NEED_SUCCESS (Flush, (self));
… …
1243void 1395void
1244gl_object_info (OpenCL::Memory self) 1396gl_object_info (OpenCL::Memory self)
1245 PPCODE: 1397 PPCODE:
1246 cl_gl_object_type type; 1398 cl_gl_object_type type;
1247 cl_GLuint name; 1399 cl_GLuint name;
1248 NEED_SUCCESS (clGetGLObjectInfo, (self, &type, &name)); 1400 NEED_SUCCESS (GetGLObjectInfo, (self, &type, &name));
1249 EXTEND (SP, 2); 1401 EXTEND (SP, 2);
1250 PUSHs (sv_2mortal (newSVuv (type))); 1402 PUSHs (sv_2mortal (newSVuv (type)));
1251 PUSHs (sv_2mortal (newSVuv (name))); 1403 PUSHs (sv_2mortal (newSVuv (name)));
1252 1404
1253#endif 1405#endif
… …
1298 1450
1299void 1451void
1300target (OpenCL::Image self) 1452target (OpenCL::Image self)
1301 PPCODE: 1453 PPCODE:
1302 cl_GLenum value [1]; 1454 cl_GLenum value [1];
1303 NEED_SUCCESS (GetGlTextureInfo, (self, CL_GL_TEXTURE_TARGET, sizeof (value), value, 0)); 1455 NEED_SUCCESS (GetGLTextureInfo, (self, CL_GL_TEXTURE_TARGET, sizeof (value), value, 0));
1304 EXTEND (SP, 1); 1456 EXTEND (SP, 1);
1305 const int i = 0; 1457 const int i = 0;
1306 PUSHs (sv_2mortal (newSVuv (value [i]))); 1458 PUSHs (sv_2mortal (newSVuv (value [i])));
1307 1459
1308void 1460void
1309gl_mipmap_level (OpenCL::Image self) 1461gl_mipmap_level (OpenCL::Image self)
1310 PPCODE: 1462 PPCODE:
1311 cl_GLint value [1]; 1463 cl_GLint value [1];
1312 NEED_SUCCESS (GetGlTextureInfo, (self, CL_GL_MIPMAP_LEVEL, sizeof (value), value, 0)); 1464 NEED_SUCCESS (GetGLTextureInfo, (self, CL_GL_MIPMAP_LEVEL, sizeof (value), value, 0));
1313 EXTEND (SP, 1); 1465 EXTEND (SP, 1);
1314 const int i = 0; 1466 const int i = 0;
1315 PUSHs (sv_2mortal (newSViv (value [i]))); 1467 PUSHs (sv_2mortal (newSViv (value [i])));
1316 1468
1317#END:gl_texture 1469#END:gl_texture
… …
1463 { 1615 {
1464 SV *sv = sv_2mortal (newSV (sizes [i])); 1616 SV *sv = sv_2mortal (newSV (sizes [i]));
1465 SvUPGRADE (sv, SVt_PV); 1617 SvUPGRADE (sv, SVt_PV);
1466 SvPOK_only (sv); 1618 SvPOK_only (sv);
1467 SvCUR_set (sv, sizes [i]); 1619 SvCUR_set (sv, sizes [i]);
1468 ptrs [i] = SvPVX (sv); 1620 ptrs [i] = (void *)SvPVX (sv);
1469 PUSHs (sv); 1621 PUSHs (sv);
1470 } 1622 }
1471 1623
1472 NEED_SUCCESS (GetProgramInfo, (self, CL_PROGRAM_BINARIES , sizeof (*ptrs ) * n, ptrs , &size)); 1624 NEED_SUCCESS (GetProgramInfo, (self, CL_PROGRAM_BINARIES , sizeof (*ptrs ) * n, ptrs , &size));
1473 if (size != sizeof (*ptrs) * n) XSRETURN_EMPTY; 1625 if (size != sizeof (*ptrs) * n) XSRETURN_EMPTY;
… …
1623set_sampler (OpenCL::Kernel self, cl_uint idx, OpenCL::Sampler value) 1775set_sampler (OpenCL::Kernel self, cl_uint idx, OpenCL::Sampler value)
1624 CODE: 1776 CODE:
1625 clSetKernelArg (self, idx, sizeof (value), &value); 1777 clSetKernelArg (self, idx, sizeof (value), &value);
1626 1778
1627void 1779void
1780set_local (OpenCL::Kernel self, cl_uint idx, size_t size)
1781 CODE:
1782 clSetKernelArg (self, idx, size, 0);
1783
1784void
1628set_event (OpenCL::Kernel self, cl_uint idx, OpenCL::Event value) 1785set_event (OpenCL::Kernel self, cl_uint idx, OpenCL::Event value)
1629 CODE: 1786 CODE:
1630 clSetKernelArg (self, idx, sizeof (value), &value); 1787 clSetKernelArg (self, idx, sizeof (value), &value);
1631 1788
1632void 1789void

Diff Legend

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