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

Comparing OpenCL/OpenCL.xs (file contents):
Revision 1.25 by root, Thu Apr 19 12:55:30 2012 UTC vs.
Revision 1.29 by root, Thu Apr 19 13:51:36 2012 UTC

… …
144 return 0; 144 return 0;
145 145
146 if (SvROK (sv) && SvTYPE (SvRV (sv)) == SVt_PVAV) 146 if (SvROK (sv) && SvTYPE (SvRV (sv)) == SVt_PVAV)
147 { 147 {
148 AV *av = (AV *)SvRV (sv); 148 AV *av = (AV *)SvRV (sv);
149 int i, len = av_len (av); 149 int i, len = av_len (av) + 1;
150 cl_context_properties *p = tmpbuf (sizeof (cl_context_properties) * (len + extracount + 1)); 150 cl_context_properties *p = tmpbuf (sizeof (cl_context_properties) * (len + extracount + 1));
151 cl_context_properties *l = p; 151 cl_context_properties *l = p;
152 152
153 if (len & 1) 153 if (len & 1)
154 croak ("%s: %s is not a property list (must be even number of elements)", func, svname); 154 croak ("%s: %s is not a property list (must be even number of elements)", func, svname);
… …
156 while (extracount--) 156 while (extracount--)
157 *l++ = *extra++; 157 *l++ = *extra++;
158 158
159 for (i = 0; i < len; i += 2) 159 for (i = 0; i < len; i += 2)
160 { 160 {
161 cl_context_properties t = SvIV (*av_fetch (av, i, 0)); 161 cl_context_properties t = SvIV (*av_fetch (av, i , 0));
162 SV *p_sv = *av_fetch (av, i + 1, 0);
162 cl_context_properties v; 163 cl_context_properties v;
163 164
164 switch (t) 165 switch (t)
165 { 166 {
166 default: 167 default:
167 /* unknown property, treat as int */ 168 /* unknown property, treat as int */
168 v = SvIV (*av_fetch (av, i, 0)); 169 v = SvIV (p_sv);
169 break; 170 break;
170 } 171 }
171 172
172 *l++ = t; 173 *l++ = t;
173 *l++ = v; 174 *l++ = v;
… …
336 337
337void 338void
338context (OpenCL::Platform self, cl_context_properties *properties = 0, SV *devices, FUTURE notify = 0) 339context (OpenCL::Platform self, cl_context_properties *properties = 0, SV *devices, FUTURE notify = 0)
339 PPCODE: 340 PPCODE:
340 if (!SvROK (devices) || SvTYPE (SvRV (devices)) != SVt_PVAV) 341 if (!SvROK (devices) || SvTYPE (SvRV (devices)) != SVt_PVAV)
341 croak ("OpenCL::Platform argument 'device' must be an arrayref with device objects, in call"); 342 croak ("OpenCL::Platform::context argument 'device' must be an arrayref with device objects, in call");
342 343
343 AV *av = (AV *)SvRV (devices); 344 AV *av = (AV *)SvRV (devices);
344 cl_uint num_devices = av_len (av) + 1; 345 cl_uint num_devices = av_len (av) + 1;
345 cl_device_id *device_list = tmpbuf (sizeof (cl_device_id) * num_devices); 346 cl_device_id *device_list = tmpbuf (sizeof (cl_device_id) * num_devices);
346 int i; 347 int i;
… …
616 617
617void 618void
618buffer (OpenCL::Context self, cl_mem_flags flags, size_t len) 619buffer (OpenCL::Context self, cl_mem_flags flags, size_t len)
619 PPCODE: 620 PPCODE:
620 if (flags & (CL_MEM_USE_HOST_PTR | CL_MEM_COPY_HOST_PTR)) 621 if (flags & (CL_MEM_USE_HOST_PTR | CL_MEM_COPY_HOST_PTR))
621 croak ("clCreateBuffer: cannot use/copy host ptr when no data is given, use $context->buffer_sv instead?"); 622 croak ("OpenCL::Context::buffer: cannot use/copy host ptr when no data is given, use $context->buffer_sv instead?");
622 623
623 NEED_SUCCESS_ARG (cl_mem mem, CreateBuffer, (self, flags, len, 0, &res)); 624 NEED_SUCCESS_ARG (cl_mem mem, CreateBuffer, (self, flags, len, 0, &res));
624 XPUSH_NEW_OBJ ("OpenCL::BufferObj", mem); 625 XPUSH_NEW_OBJ ("OpenCL::BufferObj", mem);
625 626
626void 627void
627buffer_sv (OpenCL::Context self, cl_mem_flags flags, SV *data) 628buffer_sv (OpenCL::Context self, cl_mem_flags flags, SV *data)
628 PPCODE: 629 PPCODE:
629 STRLEN len; 630 STRLEN len;
630 char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0; 631 char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0;
631 if (!(flags & (CL_MEM_USE_HOST_PTR | CL_MEM_COPY_HOST_PTR))) 632 if (!(flags & (CL_MEM_USE_HOST_PTR | CL_MEM_COPY_HOST_PTR)))
632 croak ("clCreateBuffer: have to specify use or copy host ptr when buffer data is given, use $context->buffer instead?"); 633 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)); 634 NEED_SUCCESS_ARG (cl_mem mem, CreateBuffer, (self, flags, len, ptr, &res));
634 XPUSH_NEW_OBJ ("OpenCL::BufferObj", mem); 635 XPUSH_NEW_OBJ ("OpenCL::BufferObj", mem);
635 636
636void 637void
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) 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)
… …
672 XPUSH_NEW_OBJ ("OpenCL::Image3D", mem); 673 XPUSH_NEW_OBJ ("OpenCL::Image3D", mem);
673 674
674void 675void
675gl_renderbuffer (OpenCL::Context self, cl_mem_flags flags, cl_GLuint renderbuffer) 676gl_renderbuffer (OpenCL::Context self, cl_mem_flags flags, cl_GLuint renderbuffer)
676 PPCODE: 677 PPCODE:
677 NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLRenderBuffer, (self, flags, renderbuffer, &res)); 678 NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLRenderbuffer, (self, flags, renderbuffer, &res));
678 XPUSH_NEW_OBJ ("OpenCL::Image2D", mem); 679 XPUSH_NEW_OBJ ("OpenCL::Image2D", mem);
679 680
680#endif 681#endif
681 682
682void 683void
… …
1037 NEED_SUCCESS (EnqueueNDRangeKernel, (self, kernel, gws_len, gwo, gws, lws, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0)); 1038 NEED_SUCCESS (EnqueueNDRangeKernel, (self, kernel, gws_len, gwo, gws, lws, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0));
1038 1039
1039 if (ev) 1040 if (ev)
1040 XPUSH_NEW_OBJ ("OpenCL::Event", ev); 1041 XPUSH_NEW_OBJ ("OpenCL::Event", ev);
1041 1042
1042#if 0
1043#if cl_apple_gl_sharing || cl_khr_gl_sharing 1043#if cl_apple_gl_sharing || cl_khr_gl_sharing
1044 1044
1045void 1045void
1046enqueue_acquire_gl_objects (OpenCL::Queue self, SV *objects, ...) 1046enqueue_acquire_gl_objects (OpenCL::Queue self, SV *objects, ...)
1047 ALIAS:
1048 enqueue_release_gl_objects = 1
1047 CODE: 1049 CODE:
1050 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");
1052
1048 cl_event ev = 0; 1053 cl_event ev = 0;
1049 EVENT_LIST (2, items - 2); 1054 EVENT_LIST (2, items - 2);
1055 AV *av = (AV *)SvRV (objects);
1056 cl_uint num_objects = av_len (av) + 1;
1057 cl_mem *object_list = tmpbuf (sizeof (cl_mem) * num_objects);
1058 int i;
1050 1059
1060 for (i = num_objects; i--; )
1061 object_list [i] = SvPTROBJ ("OpenCL::Queue::enqueue_acquire/release_gl_objects", "objects", *av_fetch (av, i, 0), "OpenCL::Memory");
1062
1063 if (ix)
1064 NEED_SUCCESS (EnqueueReleaseGLObjects, (self, num_objects, object_list, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0));
1065 else
1051 NEED_SUCCESS (EnqueueAcquireGLObjects, (self, ..., event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0)); 1066 NEED_SUCCESS (EnqueueAcquireGLObjects, (self, num_objects, object_list, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0));
1052 1067
1053 if (ev) 1068 if (ev)
1054 XPUSH_NEW_OBJ ("OpenCL::Event", ev); 1069 XPUSH_NEW_OBJ ("OpenCL::Event", ev);
1055 1070
1056void
1057enqueue_release_gl_objects (OpenCL::Queue self, SV *objects, ...)
1058 CODE:
1059 cl_event ev = 0;
1060 EVENT_LIST (2, items - 2);
1061
1062 NEED_SUCCESS (EnqueueAcquireGLObjects, (self, ..., event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0));
1063
1064 if (ev)
1065 XPUSH_NEW_OBJ ("OpenCL::Event", ev);
1066
1067#endif
1068#endif 1071#endif
1069 1072
1070void 1073void
1071enqueue_marker (OpenCL::Queue self) 1074enqueue_marker (OpenCL::Queue self)
1072 PPCODE: 1075 PPCODE:
… …
1233 NEED_SUCCESS (RetainMemObject, (value [i])); 1236 NEED_SUCCESS (RetainMemObject, (value [i]));
1234 PUSHs (NEW_MORTAL_OBJ ("OpenCL::Memory", value [i])); 1237 PUSHs (NEW_MORTAL_OBJ ("OpenCL::Memory", value [i]));
1235 } 1238 }
1236 1239
1237#END:mem 1240#END:mem
1241
1242#if cl_apple_gl_sharing || cl_khr_gl_sharing
1243
1244void
1245gl_object_info (OpenCL::Memory self)
1246 PPCODE:
1247 cl_gl_object_type type;
1248 cl_GLuint name;
1249 NEED_SUCCESS (clGetGLObjectInfo, (self, &type, &name));
1250 EXTEND (SP, 2);
1251 PUSHs (sv_2mortal (newSVuv (type)));
1252 PUSHs (sv_2mortal (newSVuv (name)));
1253
1254#endif
1238 1255
1239MODULE = OpenCL PACKAGE = OpenCL::BufferObj 1256MODULE = OpenCL PACKAGE = OpenCL::BufferObj
1240 1257
1241void 1258void
1242sub_buffer_region (OpenCL::BufferObj self, cl_mem_flags flags, size_t origin, size_t size) 1259sub_buffer_region (OpenCL::BufferObj self, cl_mem_flags flags, size_t origin, size_t size)
… …
1273 EXTEND (SP, 1); 1290 EXTEND (SP, 1);
1274 const int i = 0; 1291 const int i = 0;
1275 PUSHs (sv_2mortal (newSVuv (value [i]))); 1292 PUSHs (sv_2mortal (newSVuv (value [i])));
1276 1293
1277#END:image 1294#END:image
1295
1296#if cl_apple_gl_sharing || cl_khr_gl_sharing
1297
1298#BEGIN:gl_texture
1299
1300void
1301target (OpenCL::Image self)
1302 PPCODE:
1303 cl_GLenum value [1];
1304 NEED_SUCCESS (GetGlTextureInfo, (self, CL_GL_TEXTURE_TARGET, sizeof (value), value, 0));
1305 EXTEND (SP, 1);
1306 const int i = 0;
1307 PUSHs (sv_2mortal (newSVuv (value [i])));
1308
1309void
1310gl_mipmap_level (OpenCL::Image self)
1311 PPCODE:
1312 cl_GLint value [1];
1313 NEED_SUCCESS (GetGlTextureInfo, (self, CL_GL_MIPMAP_LEVEL, sizeof (value), value, 0));
1314 EXTEND (SP, 1);
1315 const int i = 0;
1316 PUSHs (sv_2mortal (newSViv (value [i])));
1317
1318#END:gl_texture
1319
1320#endif
1278 1321
1279MODULE = OpenCL PACKAGE = OpenCL::Sampler 1322MODULE = OpenCL PACKAGE = OpenCL::Sampler
1280 1323
1281void 1324void
1282DESTROY (OpenCL::Sampler self) 1325DESTROY (OpenCL::Sampler self)

Diff Legend

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