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

Comparing OpenCL/OpenCL.xs (file contents):
Revision 1.43 by root, Sat Apr 21 22:16:09 2012 UTC vs.
Revision 1.47 by root, Tue Apr 24 13:30:49 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)
…		…
765	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)
766	PPCODE:	780	PPCODE:
767	STRLEN len;	781	STRLEN len;
768	char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0;	782	char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0;
769	const cl_image_format format = { channel_order, channel_type };	783	const cl_image_format format = { channel_order, channel_type };
770	#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
771	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 };
772	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));
773	#else
774	NEED_SUCCESS_ARG (cl_mem mem, CreateImage2D, (self, flags, &format, width, height, row_pitch, ptr, &res));
775	#endif	789	#endif
776	XPUSH_NEW_OBJ ("OpenCL::Image2D", mem);	790	XPUSH_NEW_OBJ ("OpenCL::Image2D", mem);
777		791
778	void	792	void
779	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)
780	PPCODE:	794	PPCODE:
781	STRLEN len;	795	STRLEN len;
782	char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0;	796	char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0;
783	const cl_image_format format = { channel_order, channel_type };	797	const cl_image_format format = { channel_order, channel_type };
784	#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
785	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 };
786	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));
787	#else
788	NEED_SUCCESS_ARG (cl_mem mem, CreateImage3D, (self, flags, &format, width, height, depth, row_pitch, slice_pitch, ptr, &res));
789	#endif	803	#endif
790	XPUSH_NEW_OBJ ("OpenCL::Image3D", mem);	804	XPUSH_NEW_OBJ ("OpenCL::Image3D", mem);
791		805
792	#if cl_apple_gl_sharing \|\| cl_khr_gl_sharing	806	#if cl_apple_gl_sharing \|\| cl_khr_gl_sharing
793		807
…		…
806	#if CL_VERSION_1_2	820	#if CL_VERSION_1_2
807		821
808	void	822	void
809	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)
810	ALIAS:	824	ALIAS:
811	gl_texture2d = 0
812	gl_texture3d = 0
813	PPCODE:	825	PPCODE:
814	NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture, (self, flags, target, miplevel, texture, &res));	826	NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture, (self, flags, target, miplevel, texture, &res));
815	cl_gl_object_type type;	827	cl_gl_object_type type;
816	NEED_SUCCESS (GetGLObjectInfo, (mem, &type, 0)); // TODO: use target instead?	828	NEED_SUCCESS (GetGLObjectInfo, (mem, &type, 0)); // TODO: use target instead?
817	char *klass = "OpenCL::Memory";	829	char *klass = "OpenCL::Memory";
…		…
824	case CL_GL_OBJECT_TEXTURE2D_ARRAY: klass = "OpenCL::Image2DArray"; break;	836	case CL_GL_OBJECT_TEXTURE2D_ARRAY: klass = "OpenCL::Image2DArray"; break;
825	case CL_GL_OBJECT_TEXTURE3D: klass = "OpenCL::Image3D"; break;	837	case CL_GL_OBJECT_TEXTURE3D: klass = "OpenCL::Image3D"; break;
826	}	838	}
827	XPUSH_NEW_OBJ (klass, mem);	839	XPUSH_NEW_OBJ (klass, mem);
828		840
		841	#endif
		842
		843	void
		844	gl_texture2d (OpenCL::Context self, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture)
		845	PPCODE:
		846	#if PREFER_1_1
		847	NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture2D, (self, flags, target, miplevel, texture, &res));
829	#else	848	#else
830
831	void
832	gl_texture2d (OpenCL::Context self, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture)
833	PPCODE:
834	NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture2D, (self, flags, target, miplevel, texture, &res));	849	NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture , (self, flags, target, miplevel, texture, &res));
		850	#endif
835	XPUSH_NEW_OBJ ("OpenCL::Image2D", mem);	851	XPUSH_NEW_OBJ ("OpenCL::Image2D", mem);
836		852
837	void	853	void
838	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)
839	PPCODE:	855	PPCODE:
		856	#if PREFER_1_1
840	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
841	XPUSH_NEW_OBJ ("OpenCL::Image3D", mem);	861	XPUSH_NEW_OBJ ("OpenCL::Image3D", mem);
842
843	#endif
844		862
845	#endif	863	#endif
846		864
847	void	865	void
848	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)
…		…
1232	if (ev)	1250	if (ev)
1233	XPUSH_NEW_OBJ ("OpenCL::Event", ev);	1251	XPUSH_NEW_OBJ ("OpenCL::Event", ev);
1234		1252
1235	#endif	1253	#endif
1236		1254
1237	#if !CL_VERSION_1_2 \|\| defined CL_USE_DEPRECATED_OPENCL_1_1_APIS
1238
1239	void	1255	void
1240	enqueue_wait_for_events (OpenCL::Queue self, ...)	1256	enqueue_wait_for_events (OpenCL::Queue self, ...)
1241	CODE:	1257	CODE:
1242	EVENT_LIST (1, items - 1);	1258	EVENT_LIST (1, items - 1);
		1259	#if PREFER_1_1
1243	NEED_SUCCESS (EnqueueWaitForEvents, (self, event_list_count, event_list_ptr));	1260	NEED_SUCCESS (EnqueueWaitForEvents, (self, event_list_count, event_list_ptr));
1244		1261	#else
		1262	NEED_SUCCESS (EnqueueBarrierWithWaitList, (self, event_list_count, event_list_ptr, 0));
1245	#endif	1263	#endif
1246		1264
1247	void	1265	void
1248	enqueue_marker (OpenCL::Queue self, ...)	1266	enqueue_marker (OpenCL::Queue self, ...)
1249	PPCODE:	1267	PPCODE:
1250	cl_event ev = 0;	1268	cl_event ev = 0;
1251	EVENT_LIST (1, items - 1);	1269	EVENT_LIST (1, items - 1);
		1270	#if PREFER_1_1
		1271	if (!event_list_count)
		1272	NEED_SUCCESS (EnqueueMarker, (self, GIMME_V != G_VOID ? &ev : 0));
		1273	else
1252	#if CL_VERSION_1_2	1274	#if CL_VERSION_1_2
		1275	NEED_SUCCESS (EnqueueMarkerWithWaitList, (self, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0));
		1276	#else
		1277	NEED_SUCCESS (EnqueueWaitForEvents, (self, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0)); // also a barrier
		1278	#endif
		1279	#else
1253	NEED_SUCCESS (EnqueueMarkerWithWaitList, (self, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0));	1280	NEED_SUCCESS (EnqueueMarkerWithWaitList, (self, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0));
1254	#else
1255	if (event_list_count)
1256	croak ("OpenCL::Queue->enqueue_marker does not support a wait list in OpenCL 1.1 - upgrade to 1.2");
1257	NEED_SUCCESS (EnqueueMarker, (self, GIMME_V != G_VOID ? &ev : 0));
1258	#endif	1281	#endif
1259	if (ev)	1282	if (ev)
1260	XPUSH_NEW_OBJ ("OpenCL::Event", ev);	1283	XPUSH_NEW_OBJ ("OpenCL::Event", ev);
1261		1284
1262	void	1285	void
1263	enqueue_barrier (OpenCL::Queue self, ...)	1286	enqueue_barrier (OpenCL::Queue self, ...)
1264	PPCODE:	1287	PPCODE:
1265	cl_event ev = 0;	1288	cl_event ev = 0;
1266	EVENT_LIST (1, items - 1);	1289	EVENT_LIST (1, items - 1);
		1290	#if PREFER_1_1
		1291	if (!event_list_count && GIMME_V == G_VOID)
		1292	NEED_SUCCESS (EnqueueBarrier, (self));
		1293	else
1267	#if CL_VERSION_1_2	1294	#if CL_VERSION_1_2
1268	NEED_SUCCESS (EnqueueBarrierWithWaitList, (self, event_list_count, event_list_ptr, &ev));	1295	NEED_SUCCESS (EnqueueBarrierWithWaitList, (self, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0));
1269	#else	1296	#else
		1297	{
1270	if (event_list_count)	1298	if (event_list_count)
1271	croak ("OpenCL::Queue->enqueue_barrier does not support a wait list in OpenCL 1.1 - upgrade to 1.2");	1299	NEED_SUCCESS (EnqueueWaitForEvents, (self, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0));
		1300
1272	if (GIMME_V != G_VOID)	1301	if (GIMME_V != G_VOID)
1273	croak ("OpenCL::Queue->enqueue_barrier does not return an event object in OpenCL 1.1 - upgrade to 1.2");
1274	NEED_SUCCESS (EnqueueBarrier, (self));	1302	NEED_SUCCESS (EnqueueMarker, (self, &ev));
		1303	}
		1304	#endif
		1305	#else
		1306	NEED_SUCCESS (EnqueueBarrierWithWaitList, (self, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0));
1275	#endif	1307	#endif
1276	if (ev)	1308	if (ev)
1277	XPUSH_NEW_OBJ ("OpenCL::Event", ev);	1309	XPUSH_NEW_OBJ ("OpenCL::Event", ev);
1278		1310
1279	void	1311	void
…		…
1625	void	1657	void
1626	kernel (OpenCL::Program program, SV *function)	1658	kernel (OpenCL::Program program, SV *function)
1627	PPCODE:	1659	PPCODE:
1628	NEED_SUCCESS_ARG (cl_kernel kernel, CreateKernel, (program, SvPVbyte_nolen (function), &res));	1660	NEED_SUCCESS_ARG (cl_kernel kernel, CreateKernel, (program, SvPVbyte_nolen (function), &res));
1629	XPUSH_NEW_OBJ ("OpenCL::Kernel", kernel);	1661	XPUSH_NEW_OBJ ("OpenCL::Kernel", kernel);
		1662
		1663	void
		1664	kernels_in_program (OpenCL::Program program)
		1665	PPCODE:
		1666	cl_uint num_kernels;
		1667	NEED_SUCCESS (CreateKernelsInProgram, (program, 0, 0, &num_kernels));
		1668	cl_kernel kernels = tmpbuf (sizeof (cl_kernel) num_kernels);
		1669	NEED_SUCCESS (CreateKernelsInProgram, (program, num_kernels, kernels, 0));
		1670
		1671	int i;
		1672	EXTEND (SP, num_kernels);
		1673	for (i = 0; i < num_kernels; ++i)
		1674	PUSHs (NEW_MORTAL_OBJ ("OpenCL::Kernel", kernels [i]));
1630		1675
1631	void	1676	void
1632	info (OpenCL::Program self, cl_program_info name)	1677	info (OpenCL::Program self, cl_program_info name)
1633	PPCODE:	1678	PPCODE:
1634	INFO (Program)	1679	INFO (Program)

Diff Legend

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

Comparing OpenCL/OpenCL.xs (file contents): Revision 1.43 by root, Sat Apr 21 22:16:09 2012 UTC vs. Revision 1.47 by root, Tue Apr 24 13:30:49 2012 UTC

Diff Legend

Comparing OpenCL/OpenCL.xs (file contents):
Revision 1.43 by root, Sat Apr 21 22:16:09 2012 UTC vs.
Revision 1.47 by root, Tue Apr 24 13:30:49 2012 UTC