[ViewVC] Diff of: cvs/OpenCL/OpenCL.xs

Comparing OpenCL/OpenCL.xs (file contents):
Revision 1.42 by root, Sat Apr 21 20:48:03 2012 UTC vs.
Revision 1.50 by root, Tue Apr 24 14:57:06 2012 UTC

…		…
11	// this. This breaks 100% of the opencl 1.1 apps, for what reason?	11	// this. This breaks 100% of the opencl 1.1 apps, for what reason?
12	// after all, the functions are deprecated, not removed.	12	// after all, the functions are deprecated, not removed.
13	// in addition, you cannot test for this in any future-proof way.	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	14	// each time a new opencl version comes out, you need to make a new
15	// release.	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 */	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
18		25
19	#ifdef __APPLE__	26	#ifdef __APPLE__
20	#include <OpenCL/opencl.h>	27	#include <OpenCL/opencl.h>
21	#else	28	#else
22	#include <CL/opencl.h>	29	#include <CL/opencl.h>
23	#endif	30	#endif
24		31
25	#if 0 // testing
26	#undef CL_USE_DEPRECATED_OPENCL_1_1_APIS
27	#undef CL_VERSION_1_2	32	#ifndef CL_VERSION_1_2
		33	#undef PREFER_1_1
		34	#define PREFER_1_1 1
28	#endif	35	#endif
29		36
30	typedef cl_platform_id OpenCL__Platform;	37	typedef cl_platform_id OpenCL__Platform;
31	typedef cl_device_id OpenCL__Device;	38	typedef cl_device_id OpenCL__Device;
32	typedef cl_context OpenCL__Context;	39	typedef cl_context OpenCL__Context;
…		…
393		400
394	void	401	void
395	info (OpenCL::Platform self, cl_platform_info name)	402	info (OpenCL::Platform self, cl_platform_info name)
396	PPCODE:	403	PPCODE:
397	INFO (Platform)	404	INFO (Platform)
		405
		406	void
		407	unload_compiler (OpenCL::Platform self)
		408	CODE:
		409	#if CL_VERSION_1_2
		410	clUnloadPlatformCompiler (self);
		411	#endif
398		412
399	#BEGIN:platform	413	#BEGIN:platform
400		414
401	void	415	void
402	profile (OpenCL::Platform self)	416	profile (OpenCL::Platform self)
…		…
759	}	773	}
760	XPUSH_NEW_OBJ (klass, mem);	774	XPUSH_NEW_OBJ (klass, mem);
761		775
762	#endif	776	#endif
763		777
764	#if !CL_VERSION_1_2 \|\| defined CL_USE_DEPRECATED_OPENCL_1_1_APIS
765
766	void	778	void
767	image2d (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)	779	image2d (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)
768	PPCODE:	780	PPCODE:
769	STRLEN len;	781	STRLEN len;
770	char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0;	782	char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0;
771	const cl_image_format format = { channel_order, channel_type };	783	const cl_image_format format = { channel_order, channel_type };
772	#if CL_VERSION_1_2	784	#if PREFER_1_1
		785	NEED_SUCCESS_ARG (cl_mem mem, CreateImage2D, (self, flags, &format, width, height, row_pitch, ptr, &res));
		786	#else
773	const cl_image_desc desc = { CL_MEM_OBJECT_IMAGE2D, width, height, 0, 0, row_pitch, 0, 0, 0, 0 };	787	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));	788	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	789	#endif
778	XPUSH_NEW_OBJ ("OpenCL::Image2D", mem);	790	XPUSH_NEW_OBJ ("OpenCL::Image2D", mem);
779		791
780	void	792	void
781	image3d (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)	793	image3d (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:	794	PPCODE:
783	STRLEN len;	795	STRLEN len;
784	char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0;	796	char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0;
785	const cl_image_format format = { channel_order, channel_type };	797	const cl_image_format format = { channel_order, channel_type };
786	#if CL_VERSION_1_2	798	#if PREFER_1_1
		799	NEED_SUCCESS_ARG (cl_mem mem, CreateImage3D, (self, flags, &format, width, height, depth, row_pitch, slice_pitch, ptr, &res));
		800	#else
787	const cl_image_desc desc = { CL_MEM_OBJECT_IMAGE3D, width, height, depth, 0, row_pitch, slice_pitch, 0, 0, 0 };	801	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));	802	NEED_SUCCESS_ARG (cl_mem mem, CreateImage, (self, flags, &format, &desc, ptr, &res));
789	#else
790	NEED_SUCCESS_ARG (cl_mem mem, CreateImage3D, (self, flags, &format, width, height, depth, row_pitch, slice_pitch, ptr, &res));
791	#endif	803	#endif
792	XPUSH_NEW_OBJ ("OpenCL::Image3D", mem);	804	XPUSH_NEW_OBJ ("OpenCL::Image3D", mem);
793
794	#endif
795		805
796	#if cl_apple_gl_sharing \|\| cl_khr_gl_sharing	806	#if cl_apple_gl_sharing \|\| cl_khr_gl_sharing
797		807
798	void	808	void
799	gl_buffer (OpenCL::Context self, cl_mem_flags flags, cl_GLuint bufobj)	809	gl_buffer (OpenCL::Context self, cl_mem_flags flags, cl_GLuint bufobj)
…		…
809		819
810	#if CL_VERSION_1_2	820	#if CL_VERSION_1_2
811		821
812	void	822	void
813	gl_texture (OpenCL::Context self, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture)	823	gl_texture (OpenCL::Context self, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture)
		824	ALIAS:
814	PPCODE:	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?
815	char *klass = "OpenCL::Memory";	829	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)	830	switch (type)
820	{	831	{
821	case CL_GL_OBJECT_TEXTURE_BUFFER: klass = "OpenCL::Image1DBuffer"; break;	832	case CL_GL_OBJECT_TEXTURE_BUFFER: klass = "OpenCL::Image1DBuffer"; break;
822	case CL_GL_OBJECT_TEXTURE1D: klass = "OpenCL::Image1D"; break;	833	case CL_GL_OBJECT_TEXTURE1D: klass = "OpenCL::Image1D"; break;
823	case CL_GL_OBJECT_TEXTURE1D_ARRAY: klass = "OpenCL::Image2DArray"; break;	834	case CL_GL_OBJECT_TEXTURE1D_ARRAY: klass = "OpenCL::Image2DArray"; break;
…		…
827	}	838	}
828	XPUSH_NEW_OBJ (klass, mem);	839	XPUSH_NEW_OBJ (klass, mem);
829		840
830	#endif	841	#endif
831		842
832	#if !CL_VERSION_1_2 \|\| defined CL_USE_DEPRECATED_OPENCL_1_1_APIS
833
834	void	843	void
835	gl_texture2d (OpenCL::Context self, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture)	844	gl_texture2d (OpenCL::Context self, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture)
836	PPCODE:	845	PPCODE:
		846	#if PREFER_1_1
837	NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture2D, (self, flags, target, miplevel, texture, &res));	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
838	XPUSH_NEW_OBJ ("OpenCL::Image2D", mem);	851	XPUSH_NEW_OBJ ("OpenCL::Image2D", mem);
839		852
840	void	853	void
841	gl_texture3d (OpenCL::Context self, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture)	854	gl_texture3d (OpenCL::Context self, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture)
842	PPCODE:	855	PPCODE:
		856	#if PREFER_1_1
843	NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture3D, (self, flags, target, miplevel, texture, &res));	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
844	XPUSH_NEW_OBJ ("OpenCL::Image3D", mem);	861	XPUSH_NEW_OBJ ("OpenCL::Image3D", mem);
845
846	#endif
847		862
848	#endif	863	#endif
849		864
850	void	865	void
851	supported_image_formats (OpenCL::Context self, cl_mem_flags flags, cl_mem_object_type image_type)	866	supported_image_formats (OpenCL::Context self, cl_mem_flags flags, cl_mem_object_type image_type)
…		…
961	NEED_SUCCESS (EnqueueWriteBuffer, (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));
962		977
963	if (ev)	978	if (ev)
964	XPUSH_NEW_OBJ ("OpenCL::Event", ev);	979	XPUSH_NEW_OBJ ("OpenCL::Event", ev);
965		980
		981	#if CL_VERSION_1_2
		982
		983	void
		984	enqueue_fill_buffer (OpenCL::Queue self, OpenCL::Buffer mem, SV *data, size_t offset, size_t size, ...)
		985	PPCODE:
		986	cl_event ev = 0;
		987	STRLEN len;
		988	char *ptr = SvPVbyte (data, len);
		989	EVENT_LIST (5, items - 5);
		990
		991	NEED_SUCCESS (EnqueueFillBuffer, (self, mem, ptr, len, offset, size, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0));
		992
		993	if (ev)
		994	XPUSH_NEW_OBJ ("OpenCL::Event", ev);
		995
		996	void
		997	enqueue_fill_image (OpenCL::Queue self, OpenCL::Image img, NV r, NV g, NV b, NV a, size_t x, size_t y, size_t z, size_t width, size_t height, size_t depth, ...)
		998	PPCODE:
		999	cl_event ev = 0;
		1000	STRLEN len;
		1001	const size_t origin [3] = { x, y, z };
		1002	const size_t region [3] = { width, height, depth };
		1003	EVENT_LIST (12, items - 12);
		1004
		1005	const cl_float c_f [4] = { r, g, b, a };
		1006	const cl_uint c_u [4] = { r, g, b, a };
		1007	const cl_int c_s [4] = { r, g, b, a };
		1008	const void *c_fus [3] = { &c_f, &c_u, &c_s };
		1009	static const char fus [] = { 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 1, 1, 1, 0, 0 };
		1010	cl_image_format format;
		1011	NEED_SUCCESS (GetImageInfo, (img, CL_IMAGE_FORMAT, sizeof (format), &format, 0));
		1012	assert (sizeof (fus) == CL_FLOAT + 1 - CL_SNORM_INT8);
		1013	if (format.image_channel_data_type < CL_SNORM_INT8 \|\| CL_FLOAT < format.image_channel_data_type)
		1014	croak ("enqueue_fill_image: image has unsupported channel type, only opencl 1.2 channel types supported.");
		1015
		1016	NEED_SUCCESS (EnqueueFillImage, (self, img, c_fus [fus [format.image_channel_data_type]],
		1017	origin, region, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0));
		1018
		1019	if (ev)
		1020	XPUSH_NEW_OBJ ("OpenCL::Event", ev);
		1021
		1022	#endif
		1023
966	void	1024	void
967	enqueue_copy_buffer (OpenCL::Queue self, OpenCL::Buffer src, OpenCL::Buffer dst, size_t src_offset, size_t dst_offset, size_t len, ...)	1025	enqueue_copy_buffer (OpenCL::Queue self, OpenCL::Buffer src, OpenCL::Buffer dst, size_t src_offset, size_t dst_offset, size_t len, ...)
968	PPCODE:	1026	PPCODE:
969	cl_event ev = 0;	1027	cl_event ev = 0;
970	EVENT_LIST (6, items - 6);	1028	EVENT_LIST (6, items - 6);
…		…
1235	if (ev)	1293	if (ev)
1236	XPUSH_NEW_OBJ ("OpenCL::Event", ev);	1294	XPUSH_NEW_OBJ ("OpenCL::Event", ev);
1237		1295
1238	#endif	1296	#endif
1239		1297
1240	#if !CL_VERSION_1_2 \|\| defined CL_USE_DEPRECATED_OPENCL_1_1_APIS
1241
1242	void	1298	void
1243	enqueue_wait_for_events (OpenCL::Queue self, ...)	1299	enqueue_wait_for_events (OpenCL::Queue self, ...)
1244	CODE:	1300	CODE:
1245	EVENT_LIST (1, items - 1);	1301	EVENT_LIST (1, items - 1);
		1302	#if PREFER_1_1
1246	NEED_SUCCESS (EnqueueWaitForEvents, (self, event_list_count, event_list_ptr));	1303	NEED_SUCCESS (EnqueueWaitForEvents, (self, event_list_count, event_list_ptr));
1247		1304	#else
		1305	NEED_SUCCESS (EnqueueBarrierWithWaitList, (self, event_list_count, event_list_ptr, 0));
1248	#endif	1306	#endif
1249		1307
1250	void	1308	void
1251	enqueue_marker (OpenCL::Queue self, ...)	1309	enqueue_marker (OpenCL::Queue self, ...)
1252	PPCODE:	1310	PPCODE:
1253	cl_event ev = 0;	1311	cl_event ev = 0;
1254	EVENT_LIST (1, items - 1);	1312	EVENT_LIST (1, items - 1);
		1313	#if PREFER_1_1
		1314	if (!event_list_count)
		1315	NEED_SUCCESS (EnqueueMarker, (self, GIMME_V != G_VOID ? &ev : 0));
		1316	else
1255	#if CL_VERSION_1_2	1317	#if CL_VERSION_1_2
		1318	NEED_SUCCESS (EnqueueMarkerWithWaitList, (self, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0));
		1319	#else
		1320	{
		1321	NEED_SUCCESS (EnqueueWaitForEvents, (self, event_list_count, event_list_ptr)); // also a barrier
		1322	NEED_SUCCESS (EnqueueMarker, (self, GIMME_V != G_VOID ? &ev : 0));
		1323	}
		1324	#endif
		1325	#else
1256	NEED_SUCCESS (EnqueueMarkerWithWaitList, (self, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0));	1326	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	1327	#endif
1262	if (ev)	1328	if (ev)
1263	XPUSH_NEW_OBJ ("OpenCL::Event", ev);	1329	XPUSH_NEW_OBJ ("OpenCL::Event", ev);
1264		1330
1265	void	1331	void
1266	enqueue_barrier (OpenCL::Queue self, ...)	1332	enqueue_barrier (OpenCL::Queue self, ...)
1267	PPCODE:	1333	PPCODE:
1268	cl_event ev = 0;	1334	cl_event ev = 0;
1269	EVENT_LIST (1, items - 1);	1335	EVENT_LIST (1, items - 1);
		1336	#if PREFER_1_1
		1337	if (!event_list_count && GIMME_V == G_VOID)
		1338	NEED_SUCCESS (EnqueueBarrier, (self));
		1339	else
1270	#if CL_VERSION_1_2	1340	#if CL_VERSION_1_2
1271	NEED_SUCCESS (EnqueueBarrierWithWaitList, (self, event_list_count, event_list_ptr, &ev));	1341	NEED_SUCCESS (EnqueueBarrierWithWaitList, (self, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0));
1272	#else	1342	#else
		1343	{
1273	if (event_list_count)	1344	if (event_list_count)
1274	croak ("OpenCL::Queue->enqueue_barrier does not support a wait list in OpenCL 1.1 - upgrade to 1.2");	1345	NEED_SUCCESS (EnqueueWaitForEvents, (self, event_list_count, event_list_ptr));
		1346
1275	if (GIMME_V != G_VOID)	1347	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");
1277	NEED_SUCCESS (EnqueueBarrier, (self));	1348	NEED_SUCCESS (EnqueueMarker, (self, &ev));
		1349	}
		1350	#endif
		1351	#else
		1352	NEED_SUCCESS (EnqueueBarrierWithWaitList, (self, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0));
1278	#endif	1353	#endif
1279	if (ev)	1354	if (ev)
1280	XPUSH_NEW_OBJ ("OpenCL::Event", ev);	1355	XPUSH_NEW_OBJ ("OpenCL::Event", ev);
1281		1356
1282	void	1357	void
…		…
1462	void	1537	void
1463	image_info (OpenCL::Image self, cl_image_info name)	1538	image_info (OpenCL::Image self, cl_image_info name)
1464	PPCODE:	1539	PPCODE:
1465	INFO (Image)	1540	INFO (Image)
1466		1541
		1542	void
		1543	format (OpenCL::Image self)
		1544	PPCODE:
		1545	cl_image_format format;
		1546	NEED_SUCCESS (GetImageInfo, (self, CL_IMAGE_FORMAT, sizeof (format), &format, 0));
		1547	EXTEND (SP, 2);
		1548	PUSHs (sv_2mortal (newSVuv (format.image_channel_order)));
		1549	PUSHs (sv_2mortal (newSVuv (format.image_channel_data_type)));
		1550
1467	#BEGIN:image	1551	#BEGIN:image
1468		1552
1469	void	1553	void
1470	element_size (OpenCL::Image self)	1554	element_size (OpenCL::Image self)
1471	ALIAS:	1555	ALIAS:
…		…
1628	void	1712	void
1629	kernel (OpenCL::Program program, SV *function)	1713	kernel (OpenCL::Program program, SV *function)
1630	PPCODE:	1714	PPCODE:
1631	NEED_SUCCESS_ARG (cl_kernel kernel, CreateKernel, (program, SvPVbyte_nolen (function), &res));	1715	NEED_SUCCESS_ARG (cl_kernel kernel, CreateKernel, (program, SvPVbyte_nolen (function), &res));
1632	XPUSH_NEW_OBJ ("OpenCL::Kernel", kernel);	1716	XPUSH_NEW_OBJ ("OpenCL::Kernel", kernel);
		1717
		1718	void
		1719	kernels_in_program (OpenCL::Program program)
		1720	PPCODE:
		1721	cl_uint num_kernels;
		1722	NEED_SUCCESS (CreateKernelsInProgram, (program, 0, 0, &num_kernels));
		1723	cl_kernel kernels = tmpbuf (sizeof (cl_kernel) num_kernels);
		1724	NEED_SUCCESS (CreateKernelsInProgram, (program, num_kernels, kernels, 0));
		1725
		1726	int i;
		1727	EXTEND (SP, num_kernels);
		1728	for (i = 0; i < num_kernels; ++i)
		1729	PUSHs (NEW_MORTAL_OBJ ("OpenCL::Kernel", kernels [i]));
1633		1730
1634	void	1731	void
1635	info (OpenCL::Program self, cl_program_info name)	1732	info (OpenCL::Program self, cl_program_info name)
1636	PPCODE:	1733	PPCODE:
1637	INFO (Program)	1734	INFO (Program)

Diff Legend

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

Comparing OpenCL/OpenCL.xs (file contents): Revision 1.42 by root, Sat Apr 21 20:48:03 2012 UTC vs. Revision 1.50 by root, Tue Apr 24 14:57:06 2012 UTC

Diff Legend

Comparing OpenCL/OpenCL.xs (file contents):
Revision 1.42 by root, Sat Apr 21 20:48:03 2012 UTC vs.
Revision 1.50 by root, Tue Apr 24 14:57:06 2012 UTC