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

Comparing OpenCL/OpenCL.xs (file contents):
Revision 1.30 by root, Thu Apr 19 14:34:56 2012 UTC vs.
Revision 1.43 by root, Sat Apr 21 22:16:09 2012 UTC

…		…
3	#include "XSUB.h"	3	#include "XSUB.h"
4		4
5	#ifdef I_DLFCN	5	#ifdef I_DLFCN
6	#include <dlfcn.h>	6	#include <dlfcn.h>
7	#endif	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 */
8		18
9	#ifdef __APPLE__	19	#ifdef __APPLE__
10	#include <OpenCL/opencl.h>	20	#include <OpenCL/opencl.h>
11	#else	21	#else
12	#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
13	#endif	28	#endif
14		29
15	typedef cl_platform_id OpenCL__Platform;	30	typedef cl_platform_id OpenCL__Platform;
16	typedef cl_device_id OpenCL__Device;	31	typedef cl_device_id OpenCL__Device;
17	typedef cl_context OpenCL__Context;	32	typedef cl_context OpenCL__Context;
…		…
36	typedef SV *FUTURE;	51	typedef SV *FUTURE;
37		52
38	/*****************************************************************************/	53	/*****************************************************************************/
39		54
40	// name must include a leading underscore	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.
41	static void *	58	static void *
42	getsym (const char *name)	59	glsym (const char *name)
43	{	60	{
		61	void *fun = 0;
		62
44	#if defined I_DLFCN && defined RTLD_DEFAULT	63	#if defined I_DLFCN && defined RTLD_DEFAULT
45	#if !DLSYM_NEEDS_UNDERSCORE	64	fun = dlsym (RTLD_DEFAULT, name + 1);
46	++name; // skip _
47	#endif
48	return dlsym (RTLD_DEFAULT, name);	65	if (!fun) fun = dlsym (RTLD_DEFAULT, name);
49	#else	66
50	return 0;	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	}
51	#endif	93	#endif
		94
		95	return fun;
52	}	96	}
53		97
54	/*****************************************************************************/	98	/*****************************************************************************/
55		99
56	/* up to two temporary buffers */	100	/* up to two temporary buffers */
…		…
60	enum { buffers = 3 };	104	enum { buffers = 3 };
61	static int idx;	105	static int idx;
62	static void *buf [buffers];	106	static void *buf [buffers];
63	static size_t len [buffers];	107	static size_t len [buffers];
64		108
65	idx = ++idx % buffers;	109	idx = (idx + 1) % buffers;
66		110
67	if (len [idx] < size)	111	if (len [idx] < size)
68	{	112	{
69	free (buf [idx]);	113	free (buf [idx]);
70	len [idx] = ((size + 31) & ~4095) + 4096 - 32;	114	len [idx] = ((size + 31) & ~4095) + 4096 - 32;
…		…
178		222
179	for (i = 0; i < len; i += 2)	223	for (i = 0; i < len; i += 2)
180	{	224	{
181	cl_context_properties t = SvIV (*av_fetch (av, i , 0));	225	cl_context_properties t = SvIV (*av_fetch (av, i , 0));
182	SV p_sv = av_fetch (av, i + 1, 0);	226	SV p_sv = av_fetch (av, i + 1, 0);
183	cl_context_properties v;	227	cl_context_properties v = SvIV (p_sv); // code below can override
184		228
185	switch (t)	229	switch (t)
186	{	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
187	default:	249	default:
188	/* unknown property, treat as int */	250	/* unknown property, treat as int */
189	v = SvIV (p_sv);
190	break;	251	break;
191	}	252	}
192		253
193	*l++ = t;	254	*l++ = t;
194	*l++ = v;	255	*l++ = v;
…		…
211	clGetImageInfo (img, CL_IMAGE_ROW_PITCH, sizeof (res), &res, 0);	272	clGetImageInfo (img, CL_IMAGE_ROW_PITCH, sizeof (res), &res, 0);
212	return res;	273	return res;
213	}	274	}
214		275
215	static cl_event *	276	static cl_event *
216	event_list (SV **items, int count)	277	event_list (SV *items, cl_uint rcount)
217	{	278	{
		279	cl_uint count = *rcount;
		280
218	if (!count)	281	if (!count)
219	return 0;	282	return 0;
220		283
221	cl_event list = tmpbuf (sizeof (cl_event) count);	284	cl_event list = tmpbuf (sizeof (cl_event) count);
		285	int i = 0;
222		286
223	while (count--)	287	do
		288	{
		289	--count;
		290	if (SvOK (items [count]))
224	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);
225		294
		295	*rcount = i;
		296
226	return list;	297	return i ? list : 0;
227	}	298	}
228		299
229	#define EVENT_LIST(items,count) \	300	#define EVENT_LIST(items,count) \
230	cl_uint event_list_count = (count); \	301	cl_uint event_list_count = (count); \
231	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)
232		303
233	#define INFO(class) \	304	#define INFO(class) \
234	{ \	305	{ \
235	size_t size; \	306	size_t size; \
236	NEED_SUCCESS (Get ## class ## Info, (self, name, 0, 0, &size)); \	307	NEED_SUCCESS (Get ## class ## Info, (self, name, 0, 0, &size)); \
…		…
268	}	339	}
269		340
270	cl_int	341	cl_int
271	errno ()	342	errno ()
272	CODE:	343	CODE:
273	errno = res;	344	RETVAL = res;
		345	OUTPUT:
		346	RETVAL
274		347
275	const char *	348	const char *
276	err2str (cl_int err)	349	err2str (cl_int err)
277		350
278	const char *	351	const char *
…		…
297	context_from_type (cl_context_properties *properties = 0, cl_device_type type = CL_DEVICE_TYPE_DEFAULT, FUTURE notify = 0)	370	context_from_type (cl_context_properties *properties = 0, cl_device_type type = CL_DEVICE_TYPE_DEFAULT, FUTURE notify = 0)
298	PPCODE:	371	PPCODE:
299	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));
300	XPUSH_NEW_OBJ ("OpenCL::Context", ctx);	373	XPUSH_NEW_OBJ ("OpenCL::Context", ctx);
301		374
		375	#if 0
		376
302	void	377	void
303	context (cl_context_properties *properties = 0, FUTURE devices, FUTURE notify = 0)	378	context (cl_context_properties *properties = 0, FUTURE devices, FUTURE notify = 0)
304	PPCODE:	379	PPCODE:
305	/* der Gipfel der Kunst */	380	/* der Gipfel der Kunst */
		381
		382	#endif
306		383
307	void	384	void
308	wait_for_events (...)	385	wait_for_events (...)
309	CODE:	386	CODE:
310	EVENT_LIST (0, items);	387	EVENT_LIST (0, items);
…		…
425	native_vector_width_int = CL_DEVICE_NATIVE_VECTOR_WIDTH_INT	502	native_vector_width_int = CL_DEVICE_NATIVE_VECTOR_WIDTH_INT
426	native_vector_width_long = CL_DEVICE_NATIVE_VECTOR_WIDTH_LONG	503	native_vector_width_long = CL_DEVICE_NATIVE_VECTOR_WIDTH_LONG
427	native_vector_width_float = CL_DEVICE_NATIVE_VECTOR_WIDTH_FLOAT	504	native_vector_width_float = CL_DEVICE_NATIVE_VECTOR_WIDTH_FLOAT
428	native_vector_width_double = CL_DEVICE_NATIVE_VECTOR_WIDTH_DOUBLE	505	native_vector_width_double = CL_DEVICE_NATIVE_VECTOR_WIDTH_DOUBLE
429	native_vector_width_half = CL_DEVICE_NATIVE_VECTOR_WIDTH_HALF	506	native_vector_width_half = CL_DEVICE_NATIVE_VECTOR_WIDTH_HALF
430	reference_count_ext = CL_DEVICE_REFERENCE_COUNT_EXT	507	reference_count_ext = CL_DEVICE_REFERENCE_COUNT_EXT
431	PPCODE:	508	PPCODE:
432	cl_uint value [1];	509	cl_uint value [1];
433	NEED_SUCCESS (GetDeviceInfo, (self, ix, sizeof (value), value, 0));	510	NEED_SUCCESS (GetDeviceInfo, (self, ix, sizeof (value), value, 0));
434	EXTEND (SP, 1);	511	EXTEND (SP, 1);
435	const int i = 0;	512	const int i = 0;
…		…
652	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)))
653	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?");
654	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));
655	XPUSH_NEW_OBJ ("OpenCL::BufferObj", mem);	732	XPUSH_NEW_OBJ ("OpenCL::BufferObj", mem);
656		733
		734	#if CL_VERSION_1_2
		735
657	void	736	void
658	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)	737	image (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)
659	PPCODE:	738	PPCODE:
660	STRLEN len;	739	STRLEN len;
661	char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0;	740	char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0;
662	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	};
663	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	}
664	XPUSH_NEW_OBJ ("OpenCL::Image2D", mem);	760	XPUSH_NEW_OBJ (klass, mem);
665		761
		762	#endif
		763
666	void	764	void
667	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)	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)
668	PPCODE:	766	PPCODE:
669	STRLEN len;	767	STRLEN len;
670	char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0;	768	char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0;
671	const cl_image_format format = { channel_order, channel_type };	769	const cl_image_format format = { channel_order, channel_type };
		770	#if CL_VERSION_1_2
		771	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));
		773	#else
		774	NEED_SUCCESS_ARG (cl_mem mem, CreateImage2D, (self, flags, &format, width, height, row_pitch, ptr, &res));
		775	#endif
		776	XPUSH_NEW_OBJ ("OpenCL::Image2D", mem);
		777
		778	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)
		780	PPCODE:
		781	STRLEN len;
		782	char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0;
		783	const cl_image_format format = { channel_order, channel_type };
		784	#if CL_VERSION_1_2
		785	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));
		787	#else
672	NEED_SUCCESS_ARG (cl_mem mem, CreateImage3D, (self, flags, &format, width, height, depth, row_pitch, slice_pitch, ptr, &res));	788	NEED_SUCCESS_ARG (cl_mem mem, CreateImage3D, (self, flags, &format, width, height, depth, row_pitch, slice_pitch, ptr, &res));
		789	#endif
673	XPUSH_NEW_OBJ ("OpenCL::Image3D", mem);	790	XPUSH_NEW_OBJ ("OpenCL::Image3D", mem);
674		791
675	#if cl_apple_gl_sharing \|\| cl_khr_gl_sharing	792	#if cl_apple_gl_sharing \|\| cl_khr_gl_sharing
676		793
677	void	794	void
…		…
679	PPCODE:	796	PPCODE:
680	NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLBuffer, (self, flags, bufobj, &res));	797	NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLBuffer, (self, flags, bufobj, &res));
681	XPUSH_NEW_OBJ ("OpenCL::BufferObj", mem);	798	XPUSH_NEW_OBJ ("OpenCL::BufferObj", mem);
682		799
683	void	800	void
		801	gl_renderbuffer (OpenCL::Context self, cl_mem_flags flags, cl_GLuint renderbuffer)
		802	PPCODE:
		803	NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLRenderbuffer, (self, flags, renderbuffer, &res));
		804	XPUSH_NEW_OBJ ("OpenCL::Image2D", mem);
		805
		806	#if CL_VERSION_1_2
		807
		808	void
		809	gl_texture (OpenCL::Context self, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture)
		810	ALIAS:
		811	gl_texture2d = 0
		812	gl_texture3d = 0
		813	PPCODE:
		814	NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture, (self, flags, target, miplevel, texture, &res));
		815	cl_gl_object_type type;
		816	NEED_SUCCESS (GetGLObjectInfo, (mem, &type, 0)); // TODO: use target instead?
		817	char *klass = "OpenCL::Memory";
		818	switch (type)
		819	{
		820	case CL_GL_OBJECT_TEXTURE_BUFFER: klass = "OpenCL::Image1DBuffer"; break;
		821	case CL_GL_OBJECT_TEXTURE1D: klass = "OpenCL::Image1D"; break;
		822	case CL_GL_OBJECT_TEXTURE1D_ARRAY: klass = "OpenCL::Image2DArray"; break;
		823	case CL_GL_OBJECT_TEXTURE2D: klass = "OpenCL::Image2D"; break;
		824	case CL_GL_OBJECT_TEXTURE2D_ARRAY: klass = "OpenCL::Image2DArray"; break;
		825	case CL_GL_OBJECT_TEXTURE3D: klass = "OpenCL::Image3D"; break;
		826	}
		827	XPUSH_NEW_OBJ (klass, mem);
		828
		829	#else
		830
		831	void
684	gl_texture2d (OpenCL::Context self, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture)	832	gl_texture2d (OpenCL::Context self, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture)
685	PPCODE:	833	PPCODE:
686	NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture2D, (self, flags, target, miplevel, texture, &res));	834	NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture2D, (self, flags, target, miplevel, texture, &res));
687	XPUSH_NEW_OBJ ("OpenCL::Image2D", mem);	835	XPUSH_NEW_OBJ ("OpenCL::Image2D", mem);
688		836
…		…
690	gl_texture3d (OpenCL::Context self, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture)	838	gl_texture3d (OpenCL::Context self, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture)
691	PPCODE:	839	PPCODE:
692	NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture3D, (self, flags, target, miplevel, texture, &res));	840	NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture3D, (self, flags, target, miplevel, texture, &res));
693	XPUSH_NEW_OBJ ("OpenCL::Image3D", mem);	841	XPUSH_NEW_OBJ ("OpenCL::Image3D", mem);
694		842
695	void	843	#endif
696	gl_renderbuffer (OpenCL::Context self, cl_mem_flags flags, cl_GLuint renderbuffer)
697	PPCODE:
698	NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLRenderbuffer, (self, flags, renderbuffer, &res));
699	XPUSH_NEW_OBJ ("OpenCL::Image2D", mem);
700		844
701	#endif	845	#endif
702		846
703	void	847	void
704	supported_image_formats (OpenCL::Context self, cl_mem_flags flags, cl_mem_object_type image_type)	848	supported_image_formats (OpenCL::Context self, cl_mem_flags flags, cl_mem_object_type image_type)
…		…
809	cl_event ev = 0;	953	cl_event ev = 0;
810	STRLEN len;	954	STRLEN len;
811	char *ptr = SvPVbyte (data, len);	955	char *ptr = SvPVbyte (data, len);
812	EVENT_LIST (5, items - 5);	956	EVENT_LIST (5, items - 5);
813		957
814	NEED_SUCCESS (EnqueueReadBuffer, (self, mem, blocking, offset, len, ptr, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0));	958	NEED_SUCCESS (EnqueueWriteBuffer, (self, mem, blocking, offset, len, ptr, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0));
815		959
816	if (ev)	960	if (ev)
817	XPUSH_NEW_OBJ ("OpenCL::Event", ev);	961	XPUSH_NEW_OBJ ("OpenCL::Event", ev);
818		962
819	void	963	void
…		…
885	size_t min_len = host_row_pitch * host_slice_pitch * region [2];	1029	size_t min_len = host_row_pitch * host_slice_pitch * region [2];
886		1030
887	if (len < min_len)	1031	if (len < min_len)
888	croak ("clEnqueueWriteImage: data string is shorter than what would be transferred");	1032	croak ("clEnqueueWriteImage: data string is shorter than what would be transferred");
889		1033
890	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));	1034	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));
891		1035
892	if (ev)	1036	if (ev)
893	XPUSH_NEW_OBJ ("OpenCL::Event", ev);	1037	XPUSH_NEW_OBJ ("OpenCL::Event", ev);
894		1038
895	void	1039	void
…		…
950	size_t min_len = slice_pitch ? slice_pitch * depth : row_pitch * height;	1094	size_t min_len = slice_pitch ? slice_pitch * depth : row_pitch * height;
951		1095
952	if (len < min_len)	1096	if (len < min_len)
953	croak ("clEnqueueWriteImage: data string is shorter than what would be transferred");	1097	croak ("clEnqueueWriteImage: data string is shorter than what would be transferred");
954		1098
955	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));	1099	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));
956		1100
957	if (ev)	1101	if (ev)
958	XPUSH_NEW_OBJ ("OpenCL::Event", ev);	1102	XPUSH_NEW_OBJ ("OpenCL::Event", ev);
959		1103
960	void	1104	void
…		…
1042	gwo [i] = SvIV (AvARRAY (SvRV (global_work_offset))[i]);	1186	gwo [i] = SvIV (AvARRAY (SvRV (global_work_offset))[i]);
1043	}	1187	}
1044		1188
1045	if (SvOK (local_work_size))	1189	if (SvOK (local_work_size))
1046	{	1190	{
1047	if (SvOK (local_work_size) && !SvROK (local_work_size) \|\| SvTYPE (SvRV (local_work_size)) != SVt_PVAV)	1191	if ((SvOK (local_work_size) && !SvROK (local_work_size)) \|\| SvTYPE (SvRV (local_work_size)) != SVt_PVAV)
1048	croak ("clEnqueueNDRangeKernel: global_work_size must be undef or an array reference");	1192	croak ("clEnqueueNDRangeKernel: global_work_size must be undef or an array reference");
1049		1193
1050	if (AvFILLp (SvRV (local_work_size)) + 1 != gws_len)	1194	if (AvFILLp (SvRV (local_work_size)) + 1 != gws_len)
1051	croak ("clEnqueueNDRangeKernel: local_work_local must be undef or an array of same size as global_work_size");	1195	croak ("clEnqueueNDRangeKernel: local_work_local must be undef or an array of same size as global_work_size");
1052		1196
…		…
1064		1208
1065	void	1209	void
1066	enqueue_acquire_gl_objects (OpenCL::Queue self, SV *objects, ...)	1210	enqueue_acquire_gl_objects (OpenCL::Queue self, SV *objects, ...)
1067	ALIAS:	1211	ALIAS:
1068	enqueue_release_gl_objects = 1	1212	enqueue_release_gl_objects = 1
1069	CODE:	1213	PPCODE:
1070	if (!SvROK (objects) \|\| SvTYPE (SvRV (objects)) != SVt_PVAV)	1214	if (!SvROK (objects) \|\| SvTYPE (SvRV (objects)) != SVt_PVAV)
1071	croak ("OpenCL::Queue::enqueue_acquire/release_gl_objects argument 'objects' must be an arrayref with memory objects, in call");	1215	croak ("OpenCL::Queue::enqueue_acquire/release_gl_objects argument 'objects' must be an arrayref with memory objects, in call");
1072		1216
1073	cl_event ev = 0;	1217	cl_event ev = 0;
1074	EVENT_LIST (2, items - 2);	1218	EVENT_LIST (2, items - 2);
…		…
1088	if (ev)	1232	if (ev)
1089	XPUSH_NEW_OBJ ("OpenCL::Event", ev);	1233	XPUSH_NEW_OBJ ("OpenCL::Event", ev);
1090		1234
1091	#endif	1235	#endif
1092		1236
1093	void	1237	#if !CL_VERSION_1_2 \|\| defined CL_USE_DEPRECATED_OPENCL_1_1_APIS
1094	enqueue_marker (OpenCL::Queue self)
1095	PPCODE:
1096	cl_event ev;
1097	NEED_SUCCESS (EnqueueMarker, (self, &ev));
1098	XPUSH_NEW_OBJ ("OpenCL::Event", ev);
1099		1238
1100	void	1239	void
1101	enqueue_wait_for_events (OpenCL::Queue self, ...)	1240	enqueue_wait_for_events (OpenCL::Queue self, ...)
1102	CODE:	1241	CODE:
1103	EVENT_LIST (1, items - 1);	1242	EVENT_LIST (1, items - 1);
1104	NEED_SUCCESS (EnqueueWaitForEvents, (self, event_list_count, event_list_ptr));	1243	NEED_SUCCESS (EnqueueWaitForEvents, (self, event_list_count, event_list_ptr));
1105		1244
		1245	#endif
		1246
1106	void	1247	void
		1248	enqueue_marker (OpenCL::Queue self, ...)
		1249	PPCODE:
		1250	cl_event ev = 0;
		1251	EVENT_LIST (1, items - 1);
		1252	#if CL_VERSION_1_2
		1253	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
		1259	if (ev)
		1260	XPUSH_NEW_OBJ ("OpenCL::Event", ev);
		1261
		1262	void
1107	enqueue_barrier (OpenCL::Queue self)	1263	enqueue_barrier (OpenCL::Queue self, ...)
1108	CODE:	1264	PPCODE:
		1265	cl_event ev = 0;
		1266	EVENT_LIST (1, items - 1);
		1267	#if CL_VERSION_1_2
		1268	NEED_SUCCESS (EnqueueBarrierWithWaitList, (self, event_list_count, event_list_ptr, &ev));
		1269	#else
		1270	if (event_list_count)
		1271	croak ("OpenCL::Queue->enqueue_barrier does not support a wait list in OpenCL 1.1 - upgrade to 1.2");
		1272	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");
1109	NEED_SUCCESS (EnqueueBarrier, (self));	1274	NEED_SUCCESS (EnqueueBarrier, (self));
		1275	#endif
		1276	if (ev)
		1277	XPUSH_NEW_OBJ ("OpenCL::Event", ev);
1110		1278
1111	void	1279	void
1112	flush (OpenCL::Queue self)	1280	flush (OpenCL::Queue self)
1113	CODE:	1281	CODE:
1114	NEED_SUCCESS (Flush, (self));	1282	NEED_SUCCESS (Flush, (self));
…		…
1264	void	1432	void
1265	gl_object_info (OpenCL::Memory self)	1433	gl_object_info (OpenCL::Memory self)
1266	PPCODE:	1434	PPCODE:
1267	cl_gl_object_type type;	1435	cl_gl_object_type type;
1268	cl_GLuint name;	1436	cl_GLuint name;
1269	NEED_SUCCESS (clGetGLObjectInfo, (self, &type, &name));	1437	NEED_SUCCESS (GetGLObjectInfo, (self, &type, &name));
1270	EXTEND (SP, 2);	1438	EXTEND (SP, 2);
1271	PUSHs (sv_2mortal (newSVuv (type)));	1439	PUSHs (sv_2mortal (newSVuv (type)));
1272	PUSHs (sv_2mortal (newSVuv (name)));	1440	PUSHs (sv_2mortal (newSVuv (name)));
1273		1441
1274	#endif	1442	#endif
…		…
1319		1487
1320	void	1488	void
1321	target (OpenCL::Image self)	1489	target (OpenCL::Image self)
1322	PPCODE:	1490	PPCODE:
1323	cl_GLenum value [1];	1491	cl_GLenum value [1];
1324	NEED_SUCCESS (GetGlTextureInfo, (self, CL_GL_TEXTURE_TARGET, sizeof (value), value, 0));	1492	NEED_SUCCESS (GetGLTextureInfo, (self, CL_GL_TEXTURE_TARGET, sizeof (value), value, 0));
1325	EXTEND (SP, 1);	1493	EXTEND (SP, 1);
1326	const int i = 0;	1494	const int i = 0;
1327	PUSHs (sv_2mortal (newSVuv (value [i])));	1495	PUSHs (sv_2mortal (newSVuv (value [i])));
1328		1496
1329	void	1497	void
1330	gl_mipmap_level (OpenCL::Image self)	1498	gl_mipmap_level (OpenCL::Image self)
1331	PPCODE:	1499	PPCODE:
1332	cl_GLint value [1];	1500	cl_GLint value [1];
1333	NEED_SUCCESS (GetGlTextureInfo, (self, CL_GL_MIPMAP_LEVEL, sizeof (value), value, 0));	1501	NEED_SUCCESS (GetGLTextureInfo, (self, CL_GL_MIPMAP_LEVEL, sizeof (value), value, 0));
1334	EXTEND (SP, 1);	1502	EXTEND (SP, 1);
1335	const int i = 0;	1503	const int i = 0;
1336	PUSHs (sv_2mortal (newSViv (value [i])));	1504	PUSHs (sv_2mortal (newSViv (value [i])));
1337		1505
1338	#END:gl_texture	1506	#END:gl_texture
…		…
1484	{	1652	{
1485	SV *sv = sv_2mortal (newSV (sizes [i]));	1653	SV *sv = sv_2mortal (newSV (sizes [i]));
1486	SvUPGRADE (sv, SVt_PV);	1654	SvUPGRADE (sv, SVt_PV);
1487	SvPOK_only (sv);	1655	SvPOK_only (sv);
1488	SvCUR_set (sv, sizes [i]);	1656	SvCUR_set (sv, sizes [i]);
1489	ptrs [i] = SvPVX (sv);	1657	ptrs [i] = (void *)SvPVX (sv);
1490	PUSHs (sv);	1658	PUSHs (sv);
1491	}	1659	}
1492		1660
1493	NEED_SUCCESS (GetProgramInfo, (self, CL_PROGRAM_BINARIES , sizeof (ptrs ) n, ptrs , &size));	1661	NEED_SUCCESS (GetProgramInfo, (self, CL_PROGRAM_BINARIES , sizeof (ptrs ) n, ptrs , &size));
1494	if (size != sizeof (ptrs) n) XSRETURN_EMPTY;	1662	if (size != sizeof (ptrs) n) XSRETURN_EMPTY;
…		…
1644	set_sampler (OpenCL::Kernel self, cl_uint idx, OpenCL::Sampler value)	1812	set_sampler (OpenCL::Kernel self, cl_uint idx, OpenCL::Sampler value)
1645	CODE:	1813	CODE:
1646	clSetKernelArg (self, idx, sizeof (value), &value);	1814	clSetKernelArg (self, idx, sizeof (value), &value);
1647		1815
1648	void	1816	void
		1817	set_local (OpenCL::Kernel self, cl_uint idx, size_t size)
		1818	CODE:
		1819	clSetKernelArg (self, idx, size, 0);
		1820
		1821	void
1649	set_event (OpenCL::Kernel self, cl_uint idx, OpenCL::Event value)	1822	set_event (OpenCL::Kernel self, cl_uint idx, OpenCL::Event value)
1650	CODE:	1823	CODE:
1651	clSetKernelArg (self, idx, sizeof (value), &value);	1824	clSetKernelArg (self, idx, sizeof (value), &value);
1652		1825
1653	void	1826	void

Diff Legend

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

Comparing OpenCL/OpenCL.xs (file contents): Revision 1.30 by root, Thu Apr 19 14:34:56 2012 UTC vs. Revision 1.43 by root, Sat Apr 21 22:16:09 2012 UTC

Diff Legend

Comparing OpenCL/OpenCL.xs (file contents):
Revision 1.30 by root, Thu Apr 19 14:34:56 2012 UTC vs.
Revision 1.43 by root, Sat Apr 21 22:16:09 2012 UTC