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

Comparing OpenCL/OpenCL.xs (file contents):
Revision 1.37 by root, Sat Apr 21 18:49:21 2012 UTC vs.
Revision 1.42 by root, Sat Apr 21 20:48:03 2012 UTC

… …
18 18
19#ifdef __APPLE__ 19#ifdef __APPLE__
20 #include <OpenCL/opencl.h> 20 #include <OpenCL/opencl.h>
21#else 21#else
22 #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
23#endif 28#endif
24 29
25typedef cl_platform_id OpenCL__Platform; 30typedef cl_platform_id OpenCL__Platform;
26typedef cl_device_id OpenCL__Device; 31typedef cl_device_id OpenCL__Device;
27typedef cl_context OpenCL__Context; 32typedef cl_context OpenCL__Context;
… …
497 native_vector_width_int = CL_DEVICE_NATIVE_VECTOR_WIDTH_INT 502 native_vector_width_int = CL_DEVICE_NATIVE_VECTOR_WIDTH_INT
498 native_vector_width_long = CL_DEVICE_NATIVE_VECTOR_WIDTH_LONG 503 native_vector_width_long = CL_DEVICE_NATIVE_VECTOR_WIDTH_LONG
499 native_vector_width_float = CL_DEVICE_NATIVE_VECTOR_WIDTH_FLOAT 504 native_vector_width_float = CL_DEVICE_NATIVE_VECTOR_WIDTH_FLOAT
500 native_vector_width_double = CL_DEVICE_NATIVE_VECTOR_WIDTH_DOUBLE 505 native_vector_width_double = CL_DEVICE_NATIVE_VECTOR_WIDTH_DOUBLE
501 native_vector_width_half = CL_DEVICE_NATIVE_VECTOR_WIDTH_HALF 506 native_vector_width_half = CL_DEVICE_NATIVE_VECTOR_WIDTH_HALF
502 reference_count_ext = CL_DEVICE_REFERENCE_COUNT_EXT 507 reference_count_ext = CL_DEVICE_REFERENCE_COUNT_EXT
503 PPCODE: 508 PPCODE:
504 cl_uint value [1]; 509 cl_uint value [1];
505 NEED_SUCCESS (GetDeviceInfo, (self, ix, sizeof (value), value, 0)); 510 NEED_SUCCESS (GetDeviceInfo, (self, ix, sizeof (value), value, 0));
506 EXTEND (SP, 1); 511 EXTEND (SP, 1);
507 const int i = 0; 512 const int i = 0;
… …
724 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)))
725 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?");
726 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));
727 XPUSH_NEW_OBJ ("OpenCL::BufferObj", mem); 732 XPUSH_NEW_OBJ ("OpenCL::BufferObj", mem);
728 733
729#if !defined CL_VERSION_1_2 || defined CL_USE_DEPRECATED_OPENCL_1_1_APIS 734#if CL_VERSION_1_2
730 735
731void 736void
732image2d (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) 737image (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)
733 PPCODE: 738 PPCODE:
734 STRLEN len; 739 STRLEN len;
735 char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0; 740 char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0;
736 const cl_image_format format = { channel_order, channel_type }; 741 const cl_image_format format = { channel_order, channel_type };
742 const cl_image_desc desc = {
743 type,
744 width, height, depth,
745 array_size, row_pitch, slice_pitch,
746 num_mip_level, num_samples,
747 type == CL_MEM_OBJECT_IMAGE1D_BUFFER ? (cl_mem)SvPTROBJ ("OpenCL::Context::Image", "data", data, "OpenCL::Buffer") : 0
748 };
737 NEED_SUCCESS_ARG (cl_mem mem, CreateImage2D, (self, flags, &format, width, height, row_pitch, ptr, &res)); 749 NEED_SUCCESS_ARG (cl_mem mem, CreateImage, (self, flags, &format, &desc, ptr, &res));
750 char *klass = "OpenCL::Image";
751 switch (type)
752 {
753 case CL_MEM_OBJECT_IMAGE1D_BUFFER: klass = "OpenCL::Image1DBuffer"; break;
754 case CL_MEM_OBJECT_IMAGE1D: klass = "OpenCL::Image1D"; break;
755 case CL_MEM_OBJECT_IMAGE1D_ARRAY: klass = "OpenCL::Image2DArray"; break;
756 case CL_MEM_OBJECT_IMAGE2D: klass = "OpenCL::Image2D"; break;
757 case CL_MEM_OBJECT_IMAGE2D_ARRAY: klass = "OpenCL::Image2DArray"; break;
758 case CL_MEM_OBJECT_IMAGE3D: klass = "OpenCL::Image3D"; break;
759 }
738 XPUSH_NEW_OBJ ("OpenCL::Image2D", mem); 760 XPUSH_NEW_OBJ (klass, mem);
739 761
762#endif
763
764#if !CL_VERSION_1_2 || defined CL_USE_DEPRECATED_OPENCL_1_1_APIS
765
740void 766void
741image3d (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) 767image2d (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)
742 PPCODE: 768 PPCODE:
743 STRLEN len; 769 STRLEN len;
744 char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0; 770 char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0;
745 const cl_image_format format = { channel_order, channel_type }; 771 const cl_image_format format = { channel_order, channel_type };
772#if CL_VERSION_1_2
773 const cl_image_desc desc = { CL_MEM_OBJECT_IMAGE2D, width, height, 0, 0, row_pitch, 0, 0, 0, 0 };
774 NEED_SUCCESS_ARG (cl_mem mem, CreateImage, (self, flags, &format, &desc, ptr, &res));
775#else
776 NEED_SUCCESS_ARG (cl_mem mem, CreateImage2D, (self, flags, &format, width, height, row_pitch, ptr, &res));
777#endif
778 XPUSH_NEW_OBJ ("OpenCL::Image2D", mem);
779
780void
781image3d (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)
782 PPCODE:
783 STRLEN len;
784 char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0;
785 const cl_image_format format = { channel_order, channel_type };
786#if CL_VERSION_1_2
787 const cl_image_desc desc = { CL_MEM_OBJECT_IMAGE3D, width, height, depth, 0, row_pitch, slice_pitch, 0, 0, 0 };
788 NEED_SUCCESS_ARG (cl_mem mem, CreateImage, (self, flags, &format, &desc, ptr, &res));
789#else
746 NEED_SUCCESS_ARG (cl_mem mem, CreateImage3D, (self, flags, &format, width, height, depth, row_pitch, slice_pitch, ptr, &res)); 790 NEED_SUCCESS_ARG (cl_mem mem, CreateImage3D, (self, flags, &format, width, height, depth, row_pitch, slice_pitch, ptr, &res));
791#endif
747 XPUSH_NEW_OBJ ("OpenCL::Image3D", mem); 792 XPUSH_NEW_OBJ ("OpenCL::Image3D", mem);
748 793
749#endif 794#endif
750 795
751#if cl_apple_gl_sharing || cl_khr_gl_sharing 796#if cl_apple_gl_sharing || cl_khr_gl_sharing
… …
754gl_buffer (OpenCL::Context self, cl_mem_flags flags, cl_GLuint bufobj) 799gl_buffer (OpenCL::Context self, cl_mem_flags flags, cl_GLuint bufobj)
755 PPCODE: 800 PPCODE:
756 NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLBuffer, (self, flags, bufobj, &res)); 801 NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLBuffer, (self, flags, bufobj, &res));
757 XPUSH_NEW_OBJ ("OpenCL::BufferObj", mem); 802 XPUSH_NEW_OBJ ("OpenCL::BufferObj", mem);
758 803
804void
805gl_renderbuffer (OpenCL::Context self, cl_mem_flags flags, cl_GLuint renderbuffer)
806 PPCODE:
807 NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLRenderbuffer, (self, flags, renderbuffer, &res));
808 XPUSH_NEW_OBJ ("OpenCL::Image2D", mem);
809
810#if CL_VERSION_1_2
811
812void
813gl_texture (OpenCL::Context self, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture)
814 PPCODE:
815 char *klass = "OpenCL::Memory";
816 cl_gl_object_type type;
817 NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture2D, (self, flags, target, miplevel, texture, &res));
818 NEED_SUCCESS (GetGLObjectInfo, (mem, &type, 0));
819 switch (type)
820 {
821 case CL_GL_OBJECT_TEXTURE_BUFFER: klass = "OpenCL::Image1DBuffer"; break;
822 case CL_GL_OBJECT_TEXTURE1D: klass = "OpenCL::Image1D"; break;
823 case CL_GL_OBJECT_TEXTURE1D_ARRAY: klass = "OpenCL::Image2DArray"; break;
824 case CL_GL_OBJECT_TEXTURE2D: klass = "OpenCL::Image2D"; break;
825 case CL_GL_OBJECT_TEXTURE2D_ARRAY: klass = "OpenCL::Image2DArray"; break;
826 case CL_GL_OBJECT_TEXTURE3D: klass = "OpenCL::Image3D"; break;
827 }
828 XPUSH_NEW_OBJ (klass, mem);
829
830#endif
831
759#if !defined CL_VERSION_1_2 || defined CL_USE_DEPRECATED_OPENCL_1_1_APIS 832#if !CL_VERSION_1_2 || defined CL_USE_DEPRECATED_OPENCL_1_1_APIS
760 833
761void 834void
762gl_texture2d (OpenCL::Context self, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture) 835gl_texture2d (OpenCL::Context self, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture)
763 PPCODE: 836 PPCODE:
764 NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture2D, (self, flags, target, miplevel, texture, &res)); 837 NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture2D, (self, flags, target, miplevel, texture, &res));
… …
769 PPCODE: 842 PPCODE:
770 NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture3D, (self, flags, target, miplevel, texture, &res)); 843 NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture3D, (self, flags, target, miplevel, texture, &res));
771 XPUSH_NEW_OBJ ("OpenCL::Image3D", mem); 844 XPUSH_NEW_OBJ ("OpenCL::Image3D", mem);
772 845
773#endif 846#endif
774
775void
776gl_renderbuffer (OpenCL::Context self, cl_mem_flags flags, cl_GLuint renderbuffer)
777 PPCODE:
778 NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLRenderbuffer, (self, flags, renderbuffer, &res));
779 XPUSH_NEW_OBJ ("OpenCL::Image2D", mem);
780 847
781#endif 848#endif
782 849
783void 850void
784supported_image_formats (OpenCL::Context self, cl_mem_flags flags, cl_mem_object_type image_type) 851supported_image_formats (OpenCL::Context self, cl_mem_flags flags, cl_mem_object_type image_type)
… …
1168 if (ev) 1235 if (ev)
1169 XPUSH_NEW_OBJ ("OpenCL::Event", ev); 1236 XPUSH_NEW_OBJ ("OpenCL::Event", ev);
1170 1237
1171#endif 1238#endif
1172 1239
1173#if !defined CL_VERSION_1_2 || defined CL_USE_DEPRECATED_OPENCL_1_1_APIS 1240#if !CL_VERSION_1_2 || defined CL_USE_DEPRECATED_OPENCL_1_1_APIS
1174
1175void
1176enqueue_marker (OpenCL::Queue self)
1177 PPCODE:
1178 cl_event ev;
1179 NEED_SUCCESS (EnqueueMarker, (self, &ev));
1180 XPUSH_NEW_OBJ ("OpenCL::Event", ev);
1181 1241
1182void 1242void
1183enqueue_wait_for_events (OpenCL::Queue self, ...) 1243enqueue_wait_for_events (OpenCL::Queue self, ...)
1184 CODE: 1244 CODE:
1185 EVENT_LIST (1, items - 1); 1245 EVENT_LIST (1, items - 1);
1186 NEED_SUCCESS (EnqueueWaitForEvents, (self, event_list_count, event_list_ptr)); 1246 NEED_SUCCESS (EnqueueWaitForEvents, (self, event_list_count, event_list_ptr));
1187 1247
1248#endif
1249
1188void 1250void
1251enqueue_marker (OpenCL::Queue self, ...)
1252 PPCODE:
1253 cl_event ev = 0;
1254 EVENT_LIST (1, items - 1);
1255#if CL_VERSION_1_2
1256 NEED_SUCCESS (EnqueueMarkerWithWaitList, (self, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0));
1257#else
1258 if (event_list_count)
1259 croak ("OpenCL::Queue->enqueue_marker does not support a wait list in OpenCL 1.1 - upgrade to 1.2");
1260 NEED_SUCCESS (EnqueueMarker, (self, GIMME_V != G_VOID ? &ev : 0));
1261#endif
1262 if (ev)
1263 XPUSH_NEW_OBJ ("OpenCL::Event", ev);
1264
1265void
1189enqueue_barrier (OpenCL::Queue self) 1266enqueue_barrier (OpenCL::Queue self, ...)
1190 CODE: 1267 PPCODE:
1268 cl_event ev = 0;
1269 EVENT_LIST (1, items - 1);
1270#if CL_VERSION_1_2
1271 NEED_SUCCESS (EnqueueBarrierWithWaitList, (self, event_list_count, event_list_ptr, &ev));
1272#else
1273 if (event_list_count)
1274 croak ("OpenCL::Queue->enqueue_barrier does not support a wait list in OpenCL 1.1 - upgrade to 1.2");
1275 if (GIMME_V != G_VOID)
1276 croak ("OpenCL::Queue->enqueue_barrier does not return an event object in OpenCL 1.1 - upgrade to 1.2");
1191 NEED_SUCCESS (EnqueueBarrier, (self)); 1277 NEED_SUCCESS (EnqueueBarrier, (self));
1192
1193#endif 1278#endif
1279 if (ev)
1280 XPUSH_NEW_OBJ ("OpenCL::Event", ev);
1194 1281
1195void 1282void
1196flush (OpenCL::Queue self) 1283flush (OpenCL::Queue self)
1197 CODE: 1284 CODE:
1198 NEED_SUCCESS (Flush, (self)); 1285 NEED_SUCCESS (Flush, (self));

Diff Legend

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