[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.46 by root, Tue Apr 24 12:23:56 2012 UTC

…		…
2	#include "perl.h"	2	#include "perl.h"
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
		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_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
7	#endif	24	#endif
8		25
9	#ifdef __APPLE__	26	#ifdef __APPLE__
10	#include <OpenCL/opencl.h>	27	#include <OpenCL/opencl.h>
11	#else	28	#else
12	#include <CL/opencl.h>	29	#include <CL/opencl.h>
		30	#endif
		31
		32	#ifndef CL_VERSION_1_2
		33	#undef PREFER_1_1
		34	#define PREFER_1_1 1
13	#endif	35	#endif
14		36
15	typedef cl_platform_id OpenCL__Platform;	37	typedef cl_platform_id OpenCL__Platform;
16	typedef cl_device_id OpenCL__Device;	38	typedef cl_device_id OpenCL__Device;
17	typedef cl_context OpenCL__Context;	39	typedef cl_context OpenCL__Context;
…		…
36	typedef SV *FUTURE;	58	typedef SV *FUTURE;
37		59
38	/*****************************************************************************/	60	/*****************************************************************************/
39		61
40	// name must include a leading underscore	62	// name must include a leading underscore
		63	// all of this horrors would be unneceesary if somebody wrote a proper OpenGL module
		64	// for perl. doh.
41	static void *	65	static void *
42	getsym (const char *name)	66	glsym (const char *name)
43	{	67	{
		68	void *fun = 0;
		69
44	#if defined I_DLFCN && defined RTLD_DEFAULT	70	#if defined I_DLFCN && defined RTLD_DEFAULT
45	#if !DLSYM_NEEDS_UNDERSCORE	71	fun = dlsym (RTLD_DEFAULT, name + 1);
46	++name; // skip _
47	#endif
48	return dlsym (RTLD_DEFAULT, name);	72	if (!fun) fun = dlsym (RTLD_DEFAULT, name);
49	#else	73
50	return 0;	74	if (!fun)
		75	{
		76	static void *libgl;
		77	static const char *glso[] = {
		78	"libGL.so.1",
		79	"libGL.so.3",
		80	"libGL.so.4.0",
		81	"libGL.so",
		82	"/usr/lib/libGL.so",
		83	"/usr/X11R6/lib/libGL.1.dylib"
		84	};
		85	int i;
		86
		87	for (i = 0; !libgl && i < sizeof (glso) / sizeof (glso [0]); ++i)
		88	{
		89	libgl = dlopen (glso [i], RTLD_LAZY);
		90	if (libgl)
		91	break;
		92	}
		93
		94	if (libgl)
		95	{
		96	fun = dlsym (libgl, name + 1);
		97	if (!fun) fun = dlsym (libgl, name);
		98	}
		99	}
51	#endif	100	#endif
		101
		102	return fun;
52	}	103	}
53		104
54	/*****************************************************************************/	105	/*****************************************************************************/
55		106
56	/* up to two temporary buffers */	107	/* up to two temporary buffers */
…		…
60	enum { buffers = 3 };	111	enum { buffers = 3 };
61	static int idx;	112	static int idx;
62	static void *buf [buffers];	113	static void *buf [buffers];
63	static size_t len [buffers];	114	static size_t len [buffers];
64		115
65	idx = ++idx % buffers;	116	idx = (idx + 1) % buffers;
66		117
67	if (len [idx] < size)	118	if (len [idx] < size)
68	{	119	{
69	free (buf [idx]);	120	free (buf [idx]);
70	len [idx] = ((size + 31) & ~4095) + 4096 - 32;	121	len [idx] = ((size + 31) & ~4095) + 4096 - 32;
…		…
178		229
179	for (i = 0; i < len; i += 2)	230	for (i = 0; i < len; i += 2)
180	{	231	{
181	cl_context_properties t = SvIV (*av_fetch (av, i , 0));	232	cl_context_properties t = SvIV (*av_fetch (av, i , 0));
182	SV p_sv = av_fetch (av, i + 1, 0);	233	SV p_sv = av_fetch (av, i + 1, 0);
183	cl_context_properties v;	234	cl_context_properties v = SvIV (p_sv); // code below can override
184		235
185	switch (t)	236	switch (t)
186	{	237	{
		238	case CL_GLX_DISPLAY_KHR:
		239	if (!SvOK (p_sv))
		240	{
		241	void *func = glsym ("_glXGetCurrentDisplay");
		242	if (func)
		243	v = (cl_context_properties)((void ()(void))func)();
		244	}
		245	break;
		246
		247	case CL_GL_CONTEXT_KHR:
		248	if (!SvOK (p_sv))
		249	{
		250	void *func = glsym ("_glXGetCurrentContext");
		251	if (func)
		252	v = (cl_context_properties)((void ()(void))func)();
		253	}
		254	break;
		255
187	default:	256	default:
188	/* unknown property, treat as int */	257	/* unknown property, treat as int */
189	v = SvIV (p_sv);
190	break;	258	break;
191	}	259	}
192		260
193	*l++ = t;	261	*l++ = t;
194	*l++ = v;	262	*l++ = v;
…		…
211	clGetImageInfo (img, CL_IMAGE_ROW_PITCH, sizeof (res), &res, 0);	279	clGetImageInfo (img, CL_IMAGE_ROW_PITCH, sizeof (res), &res, 0);
212	return res;	280	return res;
213	}	281	}
214		282
215	static cl_event *	283	static cl_event *
216	event_list (SV **items, int count)	284	event_list (SV *items, cl_uint rcount)
217	{	285	{
		286	cl_uint count = *rcount;
		287
218	if (!count)	288	if (!count)
219	return 0;	289	return 0;
220		290
221	cl_event list = tmpbuf (sizeof (cl_event) count);	291	cl_event list = tmpbuf (sizeof (cl_event) count);
		292	int i = 0;
222		293
223	while (count--)	294	do
		295	{
		296	--count;
		297	if (SvOK (items [count]))
224	list [count] = SvPTROBJ ("clEnqueue", "wait_events", items [count], "OpenCL::Event");	298	list [i++] = SvPTROBJ ("clEnqueue", "wait_events", items [count], "OpenCL::Event");
		299	}
		300	while (count);
225		301
		302	*rcount = i;
		303
226	return list;	304	return i ? list : 0;
227	}	305	}
228		306
229	#define EVENT_LIST(items,count) \	307	#define EVENT_LIST(items,count) \
230	cl_uint event_list_count = (count); \	308	cl_uint event_list_count = (count); \
231	cl_event *event_list_ptr = event_list (&ST (items), event_list_count)	309	cl_event *event_list_ptr = event_list (&ST (items), &event_list_count)
232		310
233	#define INFO(class) \	311	#define INFO(class) \
234	{ \	312	{ \
235	size_t size; \	313	size_t size; \
236	NEED_SUCCESS (Get ## class ## Info, (self, name, 0, 0, &size)); \	314	NEED_SUCCESS (Get ## class ## Info, (self, name, 0, 0, &size)); \
…		…
268	}	346	}
269		347
270	cl_int	348	cl_int
271	errno ()	349	errno ()
272	CODE:	350	CODE:
273	errno = res;	351	RETVAL = res;
		352	OUTPUT:
		353	RETVAL
274		354
275	const char *	355	const char *
276	err2str (cl_int err)	356	err2str (cl_int err)
277		357
278	const char *	358	const char *
…		…
297	context_from_type (cl_context_properties *properties = 0, cl_device_type type = CL_DEVICE_TYPE_DEFAULT, FUTURE notify = 0)	377	context_from_type (cl_context_properties *properties = 0, cl_device_type type = CL_DEVICE_TYPE_DEFAULT, FUTURE notify = 0)
298	PPCODE:	378	PPCODE:
299	NEED_SUCCESS_ARG (cl_context ctx, CreateContextFromType, (properties, type, 0, 0, &res));	379	NEED_SUCCESS_ARG (cl_context ctx, CreateContextFromType, (properties, type, 0, 0, &res));
300	XPUSH_NEW_OBJ ("OpenCL::Context", ctx);	380	XPUSH_NEW_OBJ ("OpenCL::Context", ctx);
301		381
		382	#if 0
		383
302	void	384	void
303	context (cl_context_properties *properties = 0, FUTURE devices, FUTURE notify = 0)	385	context (cl_context_properties *properties = 0, FUTURE devices, FUTURE notify = 0)
304	PPCODE:	386	PPCODE:
305	/* der Gipfel der Kunst */	387	/* der Gipfel der Kunst */
		388
		389	#endif
306		390
307	void	391	void
308	wait_for_events (...)	392	wait_for_events (...)
309	CODE:	393	CODE:
310	EVENT_LIST (0, items);	394	EVENT_LIST (0, items);
…		…
425	native_vector_width_int = CL_DEVICE_NATIVE_VECTOR_WIDTH_INT	509	native_vector_width_int = CL_DEVICE_NATIVE_VECTOR_WIDTH_INT
426	native_vector_width_long = CL_DEVICE_NATIVE_VECTOR_WIDTH_LONG	510	native_vector_width_long = CL_DEVICE_NATIVE_VECTOR_WIDTH_LONG
427	native_vector_width_float = CL_DEVICE_NATIVE_VECTOR_WIDTH_FLOAT	511	native_vector_width_float = CL_DEVICE_NATIVE_VECTOR_WIDTH_FLOAT
428	native_vector_width_double = CL_DEVICE_NATIVE_VECTOR_WIDTH_DOUBLE	512	native_vector_width_double = CL_DEVICE_NATIVE_VECTOR_WIDTH_DOUBLE
429	native_vector_width_half = CL_DEVICE_NATIVE_VECTOR_WIDTH_HALF	513	native_vector_width_half = CL_DEVICE_NATIVE_VECTOR_WIDTH_HALF
430	reference_count_ext = CL_DEVICE_REFERENCE_COUNT_EXT	514	reference_count_ext = CL_DEVICE_REFERENCE_COUNT_EXT
431	PPCODE:	515	PPCODE:
432	cl_uint value [1];	516	cl_uint value [1];
433	NEED_SUCCESS (GetDeviceInfo, (self, ix, sizeof (value), value, 0));	517	NEED_SUCCESS (GetDeviceInfo, (self, ix, sizeof (value), value, 0));
434	EXTEND (SP, 1);	518	EXTEND (SP, 1);
435	const int i = 0;	519	const int i = 0;
…		…
652	if (!(flags & (CL_MEM_USE_HOST_PTR \| CL_MEM_COPY_HOST_PTR)))	736	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?");	737	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));	738	NEED_SUCCESS_ARG (cl_mem mem, CreateBuffer, (self, flags, len, ptr, &res));
655	XPUSH_NEW_OBJ ("OpenCL::BufferObj", mem);	739	XPUSH_NEW_OBJ ("OpenCL::BufferObj", mem);
656		740
		741	#if CL_VERSION_1_2
		742
657	void	743	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)	744	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:	745	PPCODE:
660	STRLEN len;	746	STRLEN len;
661	char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0;	747	char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0;
662	const cl_image_format format = { channel_order, channel_type };	748	const cl_image_format format = { channel_order, channel_type };
		749	const cl_image_desc desc = {
		750	type,
		751	width, height, depth,
		752	array_size, row_pitch, slice_pitch,
		753	num_mip_level, num_samples,
		754	type == CL_MEM_OBJECT_IMAGE1D_BUFFER ? (cl_mem)SvPTROBJ ("OpenCL::Context::Image", "data", data, "OpenCL::Buffer") : 0
		755	};
663	NEED_SUCCESS_ARG (cl_mem mem, CreateImage2D, (self, flags, &format, width, height, row_pitch, ptr, &res));	756	NEED_SUCCESS_ARG (cl_mem mem, CreateImage, (self, flags, &format, &desc, ptr, &res));
		757	char *klass = "OpenCL::Image";
		758	switch (type)
		759	{
		760	case CL_MEM_OBJECT_IMAGE1D_BUFFER: klass = "OpenCL::Image1DBuffer"; break;
		761	case CL_MEM_OBJECT_IMAGE1D: klass = "OpenCL::Image1D"; break;
		762	case CL_MEM_OBJECT_IMAGE1D_ARRAY: klass = "OpenCL::Image2DArray"; break;
		763	case CL_MEM_OBJECT_IMAGE2D: klass = "OpenCL::Image2D"; break;
		764	case CL_MEM_OBJECT_IMAGE2D_ARRAY: klass = "OpenCL::Image2DArray"; break;
		765	case CL_MEM_OBJECT_IMAGE3D: klass = "OpenCL::Image3D"; break;
		766	}
664	XPUSH_NEW_OBJ ("OpenCL::Image2D", mem);	767	XPUSH_NEW_OBJ (klass, mem);
665		768
		769	#endif
		770
666	void	771	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)	772	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:	773	PPCODE:
669	STRLEN len;	774	STRLEN len;
670	char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0;	775	char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0;
671	const cl_image_format format = { channel_order, channel_type };	776	const cl_image_format format = { channel_order, channel_type };
		777	#if PREFER_1_1
		778	NEED_SUCCESS_ARG (cl_mem mem, CreateImage2D, (self, flags, &format, width, height, row_pitch, ptr, &res));
		779	#else
		780	const cl_image_desc desc = { CL_MEM_OBJECT_IMAGE2D, width, height, 0, 0, row_pitch, 0, 0, 0, 0 };
		781	NEED_SUCCESS_ARG (cl_mem mem, CreateImage, (self, flags, &format, &desc, ptr, &res));
		782	#endif
		783	XPUSH_NEW_OBJ ("OpenCL::Image2D", mem);
		784
		785	void
		786	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)
		787	PPCODE:
		788	STRLEN len;
		789	char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0;
		790	const cl_image_format format = { channel_order, channel_type };
		791	#if PREFER_1_1
672	NEED_SUCCESS_ARG (cl_mem mem, CreateImage3D, (self, flags, &format, width, height, depth, row_pitch, slice_pitch, ptr, &res));	792	NEED_SUCCESS_ARG (cl_mem mem, CreateImage3D, (self, flags, &format, width, height, depth, row_pitch, slice_pitch, ptr, &res));
		793	#else
		794	const cl_image_desc desc = { CL_MEM_OBJECT_IMAGE3D, width, height, depth, 0, row_pitch, slice_pitch, 0, 0, 0 };
		795	NEED_SUCCESS_ARG (cl_mem mem, CreateImage, (self, flags, &format, &desc, ptr, &res));
		796	#endif
673	XPUSH_NEW_OBJ ("OpenCL::Image3D", mem);	797	XPUSH_NEW_OBJ ("OpenCL::Image3D", mem);
674		798
675	#if cl_apple_gl_sharing \|\| cl_khr_gl_sharing	799	#if cl_apple_gl_sharing \|\| cl_khr_gl_sharing
676		800
677	void	801	void
…		…
679	PPCODE:	803	PPCODE:
680	NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLBuffer, (self, flags, bufobj, &res));	804	NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLBuffer, (self, flags, bufobj, &res));
681	XPUSH_NEW_OBJ ("OpenCL::BufferObj", mem);	805	XPUSH_NEW_OBJ ("OpenCL::BufferObj", mem);
682		806
683	void	807	void
684	gl_texture2d (OpenCL::Context self, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture)
685	PPCODE:
686	NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture2D, (self, flags, target, miplevel, texture, &res));
687	XPUSH_NEW_OBJ ("OpenCL::Image2D", mem);
688
689	void
690	gl_texture3d (OpenCL::Context self, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture)
691	PPCODE:
692	NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture3D, (self, flags, target, miplevel, texture, &res));
693	XPUSH_NEW_OBJ ("OpenCL::Image3D", mem);
694
695	void
696	gl_renderbuffer (OpenCL::Context self, cl_mem_flags flags, cl_GLuint renderbuffer)	808	gl_renderbuffer (OpenCL::Context self, cl_mem_flags flags, cl_GLuint renderbuffer)
697	PPCODE:	809	PPCODE:
698	NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLRenderbuffer, (self, flags, renderbuffer, &res));	810	NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLRenderbuffer, (self, flags, renderbuffer, &res));
699	XPUSH_NEW_OBJ ("OpenCL::Image2D", mem);	811	XPUSH_NEW_OBJ ("OpenCL::Image2D", mem);
		812
		813	#if CL_VERSION_1_2
		814
		815	void
		816	gl_texture (OpenCL::Context self, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture)
		817	ALIAS:
		818	PPCODE:
		819	NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture, (self, flags, target, miplevel, texture, &res));
		820	cl_gl_object_type type;
		821	NEED_SUCCESS (GetGLObjectInfo, (mem, &type, 0)); // TODO: use target instead?
		822	char *klass = "OpenCL::Memory";
		823	switch (type)
		824	{
		825	case CL_GL_OBJECT_TEXTURE_BUFFER: klass = "OpenCL::Image1DBuffer"; break;
		826	case CL_GL_OBJECT_TEXTURE1D: klass = "OpenCL::Image1D"; break;
		827	case CL_GL_OBJECT_TEXTURE1D_ARRAY: klass = "OpenCL::Image2DArray"; break;
		828	case CL_GL_OBJECT_TEXTURE2D: klass = "OpenCL::Image2D"; break;
		829	case CL_GL_OBJECT_TEXTURE2D_ARRAY: klass = "OpenCL::Image2DArray"; break;
		830	case CL_GL_OBJECT_TEXTURE3D: klass = "OpenCL::Image3D"; break;
		831	}
		832	XPUSH_NEW_OBJ (klass, mem);
		833
		834	#endif
		835
		836	void
		837	gl_texture2d (OpenCL::Context self, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture)
		838	PPCODE:
		839	#if PREFER_1_1
		840	NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture2D, (self, flags, target, miplevel, texture, &res));
		841	#else
		842	NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture , (self, flags, target, miplevel, texture, &res));
		843	#endif
		844	XPUSH_NEW_OBJ ("OpenCL::Image2D", mem);
		845
		846	void
		847	gl_texture3d (OpenCL::Context self, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture)
		848	PPCODE:
		849	#if PREFER_1_1
		850	NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture3D, (self, flags, target, miplevel, texture, &res));
		851	#else
		852	NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture , (self, flags, target, miplevel, texture, &res));
		853	#endif
		854	XPUSH_NEW_OBJ ("OpenCL::Image3D", mem);
700		855
701	#endif	856	#endif
702		857
703	void	858	void
704	supported_image_formats (OpenCL::Context self, cl_mem_flags flags, cl_mem_object_type image_type)	859	supported_image_formats (OpenCL::Context self, cl_mem_flags flags, cl_mem_object_type image_type)
…		…
809	cl_event ev = 0;	964	cl_event ev = 0;
810	STRLEN len;	965	STRLEN len;
811	char *ptr = SvPVbyte (data, len);	966	char *ptr = SvPVbyte (data, len);
812	EVENT_LIST (5, items - 5);	967	EVENT_LIST (5, items - 5);
813		968
814	NEED_SUCCESS (EnqueueReadBuffer, (self, mem, blocking, offset, len, ptr, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0));	969	NEED_SUCCESS (EnqueueWriteBuffer, (self, mem, blocking, offset, len, ptr, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0));
815		970
816	if (ev)	971	if (ev)
817	XPUSH_NEW_OBJ ("OpenCL::Event", ev);	972	XPUSH_NEW_OBJ ("OpenCL::Event", ev);
818		973
819	void	974	void
…		…
885	size_t min_len = host_row_pitch * host_slice_pitch * region [2];	1040	size_t min_len = host_row_pitch * host_slice_pitch * region [2];
886		1041
887	if (len < min_len)	1042	if (len < min_len)
888	croak ("clEnqueueWriteImage: data string is shorter than what would be transferred");	1043	croak ("clEnqueueWriteImage: data string is shorter than what would be transferred");
889		1044
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));	1045	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		1046
892	if (ev)	1047	if (ev)
893	XPUSH_NEW_OBJ ("OpenCL::Event", ev);	1048	XPUSH_NEW_OBJ ("OpenCL::Event", ev);
894		1049
895	void	1050	void
…		…
950	size_t min_len = slice_pitch ? slice_pitch * depth : row_pitch * height;	1105	size_t min_len = slice_pitch ? slice_pitch * depth : row_pitch * height;
951		1106
952	if (len < min_len)	1107	if (len < min_len)
953	croak ("clEnqueueWriteImage: data string is shorter than what would be transferred");	1108	croak ("clEnqueueWriteImage: data string is shorter than what would be transferred");
954		1109
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));	1110	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		1111
957	if (ev)	1112	if (ev)
958	XPUSH_NEW_OBJ ("OpenCL::Event", ev);	1113	XPUSH_NEW_OBJ ("OpenCL::Event", ev);
959		1114
960	void	1115	void
…		…
1042	gwo [i] = SvIV (AvARRAY (SvRV (global_work_offset))[i]);	1197	gwo [i] = SvIV (AvARRAY (SvRV (global_work_offset))[i]);
1043	}	1198	}
1044		1199
1045	if (SvOK (local_work_size))	1200	if (SvOK (local_work_size))
1046	{	1201	{
1047	if (SvOK (local_work_size) && !SvROK (local_work_size) \|\| SvTYPE (SvRV (local_work_size)) != SVt_PVAV)	1202	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");	1203	croak ("clEnqueueNDRangeKernel: global_work_size must be undef or an array reference");
1049		1204
1050	if (AvFILLp (SvRV (local_work_size)) + 1 != gws_len)	1205	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");	1206	croak ("clEnqueueNDRangeKernel: local_work_local must be undef or an array of same size as global_work_size");
1052		1207
…		…
1064		1219
1065	void	1220	void
1066	enqueue_acquire_gl_objects (OpenCL::Queue self, SV *objects, ...)	1221	enqueue_acquire_gl_objects (OpenCL::Queue self, SV *objects, ...)
1067	ALIAS:	1222	ALIAS:
1068	enqueue_release_gl_objects = 1	1223	enqueue_release_gl_objects = 1
1069	CODE:	1224	PPCODE:
1070	if (!SvROK (objects) \|\| SvTYPE (SvRV (objects)) != SVt_PVAV)	1225	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");	1226	croak ("OpenCL::Queue::enqueue_acquire/release_gl_objects argument 'objects' must be an arrayref with memory objects, in call");
1072		1227
1073	cl_event ev = 0;	1228	cl_event ev = 0;
1074	EVENT_LIST (2, items - 2);	1229	EVENT_LIST (2, items - 2);
…		…
1088	if (ev)	1243	if (ev)
1089	XPUSH_NEW_OBJ ("OpenCL::Event", ev);	1244	XPUSH_NEW_OBJ ("OpenCL::Event", ev);
1090		1245
1091	#endif	1246	#endif
1092		1247
1093	void	1248	#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		1249
1100	void	1250	void
1101	enqueue_wait_for_events (OpenCL::Queue self, ...)	1251	enqueue_wait_for_events (OpenCL::Queue self, ...)
1102	CODE:	1252	CODE:
1103	EVENT_LIST (1, items - 1);	1253	EVENT_LIST (1, items - 1);
1104	NEED_SUCCESS (EnqueueWaitForEvents, (self, event_list_count, event_list_ptr));	1254	NEED_SUCCESS (EnqueueWaitForEvents, (self, event_list_count, event_list_ptr));
1105		1255
		1256	#endif
		1257
1106	void	1258	void
		1259	enqueue_marker (OpenCL::Queue self, ...)
		1260	PPCODE:
		1261	cl_event ev = 0;
		1262	EVENT_LIST (1, items - 1);
		1263	#if PREFER_1_1
		1264	#if CL_VERSION_1_2
		1265	if (event_list_count)
		1266	NEED_SUCCESS (EnqueueMarkerWithWaitList, (self, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0));
		1267	else
		1268	NEED_SUCCESS (EnqueueMarker, (self, GIMME_V != G_VOID ? &ev : 0));
		1269	#else
		1270	if (event_list_count)
		1271	croak ("OpenCL::Queue->enqueue_marker does not support a wait list in OpenCL 1.1 - upgrade to 1.2");
		1272	NEED_SUCCESS (EnqueueMarker, (self, GIMME_V != G_VOID ? &ev : 0));
		1273	#endif
		1274	#else
		1275	NEED_SUCCESS (EnqueueMarkerWithWaitList, (self, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0));
		1276	#endif
		1277	if (ev)
		1278	XPUSH_NEW_OBJ ("OpenCL::Event", ev);
		1279
		1280	void
1107	enqueue_barrier (OpenCL::Queue self)	1281	enqueue_barrier (OpenCL::Queue self, ...)
1108	CODE:	1282	PPCODE:
		1283	cl_event ev = 0;
		1284	EVENT_LIST (1, items - 1);
		1285	#if PREFER_1_1
		1286	#if CL_VERSION_1_2
		1287	if (event_list_count \|\| GIMME_V != G_VOID)
		1288	NEED_SUCCESS (EnqueueBarrierWithWaitList, (self, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0));
		1289	else
		1290	NEED_SUCCESS (EnqueueBarrier, (self));
		1291	#else
		1292	if (event_list_count)
		1293	croak ("OpenCL::Queue->enqueue_barrier does not support a wait list in OpenCL 1.1 - upgrade to 1.2");
		1294	if (GIMME_V != G_VOID)
		1295	croak ("OpenCL::Queue->enqueue_barrier does not return an event object in OpenCL 1.1 - upgrade to 1.2");
1109	NEED_SUCCESS (EnqueueBarrier, (self));	1296	NEED_SUCCESS (EnqueueBarrier, (self));
		1297	#endif
		1298	#else
		1299	NEED_SUCCESS (EnqueueBarrierWithWaitList, (self, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0));
		1300	#endif
		1301	if (ev)
		1302	XPUSH_NEW_OBJ ("OpenCL::Event", ev);
1110		1303
1111	void	1304	void
1112	flush (OpenCL::Queue self)	1305	flush (OpenCL::Queue self)
1113	CODE:	1306	CODE:
1114	NEED_SUCCESS (Flush, (self));	1307	NEED_SUCCESS (Flush, (self));
…		…
1264	void	1457	void
1265	gl_object_info (OpenCL::Memory self)	1458	gl_object_info (OpenCL::Memory self)
1266	PPCODE:	1459	PPCODE:
1267	cl_gl_object_type type;	1460	cl_gl_object_type type;
1268	cl_GLuint name;	1461	cl_GLuint name;
1269	NEED_SUCCESS (clGetGLObjectInfo, (self, &type, &name));	1462	NEED_SUCCESS (GetGLObjectInfo, (self, &type, &name));
1270	EXTEND (SP, 2);	1463	EXTEND (SP, 2);
1271	PUSHs (sv_2mortal (newSVuv (type)));	1464	PUSHs (sv_2mortal (newSVuv (type)));
1272	PUSHs (sv_2mortal (newSVuv (name)));	1465	PUSHs (sv_2mortal (newSVuv (name)));
1273		1466
1274	#endif	1467	#endif
…		…
1319		1512
1320	void	1513	void
1321	target (OpenCL::Image self)	1514	target (OpenCL::Image self)
1322	PPCODE:	1515	PPCODE:
1323	cl_GLenum value [1];	1516	cl_GLenum value [1];
1324	NEED_SUCCESS (GetGlTextureInfo, (self, CL_GL_TEXTURE_TARGET, sizeof (value), value, 0));	1517	NEED_SUCCESS (GetGLTextureInfo, (self, CL_GL_TEXTURE_TARGET, sizeof (value), value, 0));
1325	EXTEND (SP, 1);	1518	EXTEND (SP, 1);
1326	const int i = 0;	1519	const int i = 0;
1327	PUSHs (sv_2mortal (newSVuv (value [i])));	1520	PUSHs (sv_2mortal (newSVuv (value [i])));
1328		1521
1329	void	1522	void
1330	gl_mipmap_level (OpenCL::Image self)	1523	gl_mipmap_level (OpenCL::Image self)
1331	PPCODE:	1524	PPCODE:
1332	cl_GLint value [1];	1525	cl_GLint value [1];
1333	NEED_SUCCESS (GetGlTextureInfo, (self, CL_GL_MIPMAP_LEVEL, sizeof (value), value, 0));	1526	NEED_SUCCESS (GetGLTextureInfo, (self, CL_GL_MIPMAP_LEVEL, sizeof (value), value, 0));
1334	EXTEND (SP, 1);	1527	EXTEND (SP, 1);
1335	const int i = 0;	1528	const int i = 0;
1336	PUSHs (sv_2mortal (newSViv (value [i])));	1529	PUSHs (sv_2mortal (newSViv (value [i])));
1337		1530
1338	#END:gl_texture	1531	#END:gl_texture
…		…
1484	{	1677	{
1485	SV *sv = sv_2mortal (newSV (sizes [i]));	1678	SV *sv = sv_2mortal (newSV (sizes [i]));
1486	SvUPGRADE (sv, SVt_PV);	1679	SvUPGRADE (sv, SVt_PV);
1487	SvPOK_only (sv);	1680	SvPOK_only (sv);
1488	SvCUR_set (sv, sizes [i]);	1681	SvCUR_set (sv, sizes [i]);
1489	ptrs [i] = SvPVX (sv);	1682	ptrs [i] = (void *)SvPVX (sv);
1490	PUSHs (sv);	1683	PUSHs (sv);
1491	}	1684	}
1492		1685
1493	NEED_SUCCESS (GetProgramInfo, (self, CL_PROGRAM_BINARIES , sizeof (ptrs ) n, ptrs , &size));	1686	NEED_SUCCESS (GetProgramInfo, (self, CL_PROGRAM_BINARIES , sizeof (ptrs ) n, ptrs , &size));
1494	if (size != sizeof (ptrs) n) XSRETURN_EMPTY;	1687	if (size != sizeof (ptrs) n) XSRETURN_EMPTY;
…		…
1644	set_sampler (OpenCL::Kernel self, cl_uint idx, OpenCL::Sampler value)	1837	set_sampler (OpenCL::Kernel self, cl_uint idx, OpenCL::Sampler value)
1645	CODE:	1838	CODE:
1646	clSetKernelArg (self, idx, sizeof (value), &value);	1839	clSetKernelArg (self, idx, sizeof (value), &value);
1647		1840
1648	void	1841	void
		1842	set_local (OpenCL::Kernel self, cl_uint idx, size_t size)
		1843	CODE:
		1844	clSetKernelArg (self, idx, size, 0);
		1845
		1846	void
1649	set_event (OpenCL::Kernel self, cl_uint idx, OpenCL::Event value)	1847	set_event (OpenCL::Kernel self, cl_uint idx, OpenCL::Event value)
1650	CODE:	1848	CODE:
1651	clSetKernelArg (self, idx, sizeof (value), &value);	1849	clSetKernelArg (self, idx, sizeof (value), &value);
1652		1850
1653	void	1851	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.46 by root, Tue Apr 24 12:23:56 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.46 by root, Tue Apr 24 12:23:56 2012 UTC