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

Comparing OpenCL/OpenCL.xs (file contents):
Revision 1.31 by root, Thu Apr 19 14:36:46 2012 UTC vs.
Revision 1.47 by root, Tue Apr 24 13:30:49 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);
…		…
316		400
317	void	401	void
318	info (OpenCL::Platform self, cl_platform_info name)	402	info (OpenCL::Platform self, cl_platform_info name)
319	PPCODE:	403	PPCODE:
320	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
321		412
322	#BEGIN:platform	413	#BEGIN:platform
323		414
324	void	415	void
325	profile (OpenCL::Platform self)	416	profile (OpenCL::Platform self)
…		…
425	native_vector_width_int = CL_DEVICE_NATIVE_VECTOR_WIDTH_INT	516	native_vector_width_int = CL_DEVICE_NATIVE_VECTOR_WIDTH_INT
426	native_vector_width_long = CL_DEVICE_NATIVE_VECTOR_WIDTH_LONG	517	native_vector_width_long = CL_DEVICE_NATIVE_VECTOR_WIDTH_LONG
427	native_vector_width_float = CL_DEVICE_NATIVE_VECTOR_WIDTH_FLOAT	518	native_vector_width_float = CL_DEVICE_NATIVE_VECTOR_WIDTH_FLOAT
428	native_vector_width_double = CL_DEVICE_NATIVE_VECTOR_WIDTH_DOUBLE	519	native_vector_width_double = CL_DEVICE_NATIVE_VECTOR_WIDTH_DOUBLE
429	native_vector_width_half = CL_DEVICE_NATIVE_VECTOR_WIDTH_HALF	520	native_vector_width_half = CL_DEVICE_NATIVE_VECTOR_WIDTH_HALF
430	reference_count_ext = CL_DEVICE_REFERENCE_COUNT_EXT	521	reference_count_ext = CL_DEVICE_REFERENCE_COUNT_EXT
431	PPCODE:	522	PPCODE:
432	cl_uint value [1];	523	cl_uint value [1];
433	NEED_SUCCESS (GetDeviceInfo, (self, ix, sizeof (value), value, 0));	524	NEED_SUCCESS (GetDeviceInfo, (self, ix, sizeof (value), value, 0));
434	EXTEND (SP, 1);	525	EXTEND (SP, 1);
435	const int i = 0;	526	const int i = 0;
…		…
652	if (!(flags & (CL_MEM_USE_HOST_PTR \| CL_MEM_COPY_HOST_PTR)))	743	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?");	744	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));	745	NEED_SUCCESS_ARG (cl_mem mem, CreateBuffer, (self, flags, len, ptr, &res));
655	XPUSH_NEW_OBJ ("OpenCL::BufferObj", mem);	746	XPUSH_NEW_OBJ ("OpenCL::BufferObj", mem);
656		747
		748	#if CL_VERSION_1_2
		749
657	void	750	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)	751	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:	752	PPCODE:
660	STRLEN len;	753	STRLEN len;
661	char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0;	754	char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0;
662	const cl_image_format format = { channel_order, channel_type };	755	const cl_image_format format = { channel_order, channel_type };
		756	const cl_image_desc desc = {
		757	type,
		758	width, height, depth,
		759	array_size, row_pitch, slice_pitch,
		760	num_mip_level, num_samples,
		761	type == CL_MEM_OBJECT_IMAGE1D_BUFFER ? (cl_mem)SvPTROBJ ("OpenCL::Context::Image", "data", data, "OpenCL::Buffer") : 0
		762	};
663	NEED_SUCCESS_ARG (cl_mem mem, CreateImage2D, (self, flags, &format, width, height, row_pitch, ptr, &res));	763	NEED_SUCCESS_ARG (cl_mem mem, CreateImage, (self, flags, &format, &desc, ptr, &res));
		764	char *klass = "OpenCL::Image";
		765	switch (type)
		766	{
		767	case CL_MEM_OBJECT_IMAGE1D_BUFFER: klass = "OpenCL::Image1DBuffer"; break;
		768	case CL_MEM_OBJECT_IMAGE1D: klass = "OpenCL::Image1D"; break;
		769	case CL_MEM_OBJECT_IMAGE1D_ARRAY: klass = "OpenCL::Image2DArray"; break;
		770	case CL_MEM_OBJECT_IMAGE2D: klass = "OpenCL::Image2D"; break;
		771	case CL_MEM_OBJECT_IMAGE2D_ARRAY: klass = "OpenCL::Image2DArray"; break;
		772	case CL_MEM_OBJECT_IMAGE3D: klass = "OpenCL::Image3D"; break;
		773	}
664	XPUSH_NEW_OBJ ("OpenCL::Image2D", mem);	774	XPUSH_NEW_OBJ (klass, mem);
665		775
		776	#endif
		777
666	void	778	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)	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)
668	PPCODE:	780	PPCODE:
669	STRLEN len;	781	STRLEN len;
670	char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0;	782	char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0;
671	const cl_image_format format = { channel_order, channel_type };	783	const cl_image_format format = { channel_order, channel_type };
		784	#if PREFER_1_1
		785	NEED_SUCCESS_ARG (cl_mem mem, CreateImage2D, (self, flags, &format, width, height, row_pitch, ptr, &res));
		786	#else
		787	const cl_image_desc desc = { CL_MEM_OBJECT_IMAGE2D, width, height, 0, 0, row_pitch, 0, 0, 0, 0 };
		788	NEED_SUCCESS_ARG (cl_mem mem, CreateImage, (self, flags, &format, &desc, ptr, &res));
		789	#endif
		790	XPUSH_NEW_OBJ ("OpenCL::Image2D", mem);
		791
		792	void
		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)
		794	PPCODE:
		795	STRLEN len;
		796	char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0;
		797	const cl_image_format format = { channel_order, channel_type };
		798	#if PREFER_1_1
672	NEED_SUCCESS_ARG (cl_mem mem, CreateImage3D, (self, flags, &format, width, height, depth, row_pitch, slice_pitch, ptr, &res));	799	NEED_SUCCESS_ARG (cl_mem mem, CreateImage3D, (self, flags, &format, width, height, depth, row_pitch, slice_pitch, ptr, &res));
		800	#else
		801	const cl_image_desc desc = { CL_MEM_OBJECT_IMAGE3D, width, height, depth, 0, row_pitch, slice_pitch, 0, 0, 0 };
		802	NEED_SUCCESS_ARG (cl_mem mem, CreateImage, (self, flags, &format, &desc, ptr, &res));
		803	#endif
673	XPUSH_NEW_OBJ ("OpenCL::Image3D", mem);	804	XPUSH_NEW_OBJ ("OpenCL::Image3D", mem);
674		805
675	#if cl_apple_gl_sharing \|\| cl_khr_gl_sharing	806	#if cl_apple_gl_sharing \|\| cl_khr_gl_sharing
676		807
677	void	808	void
…		…
679	PPCODE:	810	PPCODE:
680	NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLBuffer, (self, flags, bufobj, &res));	811	NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLBuffer, (self, flags, bufobj, &res));
681	XPUSH_NEW_OBJ ("OpenCL::BufferObj", mem);	812	XPUSH_NEW_OBJ ("OpenCL::BufferObj", mem);
682		813
683	void	814	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)	815	gl_renderbuffer (OpenCL::Context self, cl_mem_flags flags, cl_GLuint renderbuffer)
697	PPCODE:	816	PPCODE:
698	NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLRenderbuffer, (self, flags, renderbuffer, &res));	817	NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLRenderbuffer, (self, flags, renderbuffer, &res));
699	XPUSH_NEW_OBJ ("OpenCL::Image2D", mem);	818	XPUSH_NEW_OBJ ("OpenCL::Image2D", mem);
		819
		820	#if CL_VERSION_1_2
		821
		822	void
		823	gl_texture (OpenCL::Context self, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture)
		824	ALIAS:
		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?
		829	char *klass = "OpenCL::Memory";
		830	switch (type)
		831	{
		832	case CL_GL_OBJECT_TEXTURE_BUFFER: klass = "OpenCL::Image1DBuffer"; break;
		833	case CL_GL_OBJECT_TEXTURE1D: klass = "OpenCL::Image1D"; break;
		834	case CL_GL_OBJECT_TEXTURE1D_ARRAY: klass = "OpenCL::Image2DArray"; break;
		835	case CL_GL_OBJECT_TEXTURE2D: klass = "OpenCL::Image2D"; break;
		836	case CL_GL_OBJECT_TEXTURE2D_ARRAY: klass = "OpenCL::Image2DArray"; break;
		837	case CL_GL_OBJECT_TEXTURE3D: klass = "OpenCL::Image3D"; break;
		838	}
		839	XPUSH_NEW_OBJ (klass, mem);
		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));
		848	#else
		849	NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture , (self, flags, target, miplevel, texture, &res));
		850	#endif
		851	XPUSH_NEW_OBJ ("OpenCL::Image2D", mem);
		852
		853	void
		854	gl_texture3d (OpenCL::Context self, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture)
		855	PPCODE:
		856	#if PREFER_1_1
		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
		861	XPUSH_NEW_OBJ ("OpenCL::Image3D", mem);
700		862
701	#endif	863	#endif
702		864
703	void	865	void
704	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)
…		…
809	cl_event ev = 0;	971	cl_event ev = 0;
810	STRLEN len;	972	STRLEN len;
811	char *ptr = SvPVbyte (data, len);	973	char *ptr = SvPVbyte (data, len);
812	EVENT_LIST (5, items - 5);	974	EVENT_LIST (5, items - 5);
813		975
814	NEED_SUCCESS (EnqueueReadBuffer, (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));
815		977
816	if (ev)	978	if (ev)
817	XPUSH_NEW_OBJ ("OpenCL::Event", ev);	979	XPUSH_NEW_OBJ ("OpenCL::Event", ev);
818		980
819	void	981	void
…		…
885	size_t min_len = host_row_pitch * host_slice_pitch * region [2];	1047	size_t min_len = host_row_pitch * host_slice_pitch * region [2];
886		1048
887	if (len < min_len)	1049	if (len < min_len)
888	croak ("clEnqueueWriteImage: data string is shorter than what would be transferred");	1050	croak ("clEnqueueWriteImage: data string is shorter than what would be transferred");
889		1051
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));	1052	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		1053
892	if (ev)	1054	if (ev)
893	XPUSH_NEW_OBJ ("OpenCL::Event", ev);	1055	XPUSH_NEW_OBJ ("OpenCL::Event", ev);
894		1056
895	void	1057	void
…		…
950	size_t min_len = slice_pitch ? slice_pitch * depth : row_pitch * height;	1112	size_t min_len = slice_pitch ? slice_pitch * depth : row_pitch * height;
951		1113
952	if (len < min_len)	1114	if (len < min_len)
953	croak ("clEnqueueWriteImage: data string is shorter than what would be transferred");	1115	croak ("clEnqueueWriteImage: data string is shorter than what would be transferred");
954		1116
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));	1117	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		1118
957	if (ev)	1119	if (ev)
958	XPUSH_NEW_OBJ ("OpenCL::Event", ev);	1120	XPUSH_NEW_OBJ ("OpenCL::Event", ev);
959		1121
960	void	1122	void
…		…
1042	gwo [i] = SvIV (AvARRAY (SvRV (global_work_offset))[i]);	1204	gwo [i] = SvIV (AvARRAY (SvRV (global_work_offset))[i]);
1043	}	1205	}
1044		1206
1045	if (SvOK (local_work_size))	1207	if (SvOK (local_work_size))
1046	{	1208	{
1047	if (SvOK (local_work_size) && !SvROK (local_work_size) \|\| SvTYPE (SvRV (local_work_size)) != SVt_PVAV)	1209	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");	1210	croak ("clEnqueueNDRangeKernel: global_work_size must be undef or an array reference");
1049		1211
1050	if (AvFILLp (SvRV (local_work_size)) + 1 != gws_len)	1212	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");	1213	croak ("clEnqueueNDRangeKernel: local_work_local must be undef or an array of same size as global_work_size");
1052		1214
…		…
1064		1226
1065	void	1227	void
1066	enqueue_acquire_gl_objects (OpenCL::Queue self, SV *objects, ...)	1228	enqueue_acquire_gl_objects (OpenCL::Queue self, SV *objects, ...)
1067	ALIAS:	1229	ALIAS:
1068	enqueue_release_gl_objects = 1	1230	enqueue_release_gl_objects = 1
1069	CODE:	1231	PPCODE:
1070	if (!SvROK (objects) \|\| SvTYPE (SvRV (objects)) != SVt_PVAV)	1232	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");	1233	croak ("OpenCL::Queue::enqueue_acquire/release_gl_objects argument 'objects' must be an arrayref with memory objects, in call");
1072		1234
1073	cl_event ev = 0;	1235	cl_event ev = 0;
1074	EVENT_LIST (2, items - 2);	1236	EVENT_LIST (2, items - 2);
…		…
1089	XPUSH_NEW_OBJ ("OpenCL::Event", ev);	1251	XPUSH_NEW_OBJ ("OpenCL::Event", ev);
1090		1252
1091	#endif	1253	#endif
1092		1254
1093	void	1255	void
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
1100	void
1101	enqueue_wait_for_events (OpenCL::Queue self, ...)	1256	enqueue_wait_for_events (OpenCL::Queue self, ...)
1102	CODE:	1257	CODE:
1103	EVENT_LIST (1, items - 1);	1258	EVENT_LIST (1, items - 1);
		1259	#if PREFER_1_1
1104	NEED_SUCCESS (EnqueueWaitForEvents, (self, event_list_count, event_list_ptr));	1260	NEED_SUCCESS (EnqueueWaitForEvents, (self, event_list_count, event_list_ptr));
		1261	#else
		1262	NEED_SUCCESS (EnqueueBarrierWithWaitList, (self, event_list_count, event_list_ptr, 0));
		1263	#endif
1105		1264
1106	void	1265	void
		1266	enqueue_marker (OpenCL::Queue self, ...)
		1267	PPCODE:
		1268	cl_event ev = 0;
		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
		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
		1280	NEED_SUCCESS (EnqueueMarkerWithWaitList, (self, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0));
		1281	#endif
		1282	if (ev)
		1283	XPUSH_NEW_OBJ ("OpenCL::Event", ev);
		1284
		1285	void
1107	enqueue_barrier (OpenCL::Queue self)	1286	enqueue_barrier (OpenCL::Queue self, ...)
1108	CODE:	1287	PPCODE:
		1288	cl_event ev = 0;
		1289	EVENT_LIST (1, items - 1);
		1290	#if PREFER_1_1
		1291	if (!event_list_count && GIMME_V == G_VOID)
1109	NEED_SUCCESS (EnqueueBarrier, (self));	1292	NEED_SUCCESS (EnqueueBarrier, (self));
		1293	else
		1294	#if CL_VERSION_1_2
		1295	NEED_SUCCESS (EnqueueBarrierWithWaitList, (self, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0));
		1296	#else
		1297	{
		1298	if (event_list_count)
		1299	NEED_SUCCESS (EnqueueWaitForEvents, (self, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0));
		1300
		1301	if (GIMME_V != G_VOID)
		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));
		1307	#endif
		1308	if (ev)
		1309	XPUSH_NEW_OBJ ("OpenCL::Event", ev);
1110		1310
1111	void	1311	void
1112	flush (OpenCL::Queue self)	1312	flush (OpenCL::Queue self)
1113	CODE:	1313	CODE:
1114	NEED_SUCCESS (Flush, (self));	1314	NEED_SUCCESS (Flush, (self));
…		…
1459	PPCODE:	1659	PPCODE:
1460	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));
1461	XPUSH_NEW_OBJ ("OpenCL::Kernel", kernel);	1661	XPUSH_NEW_OBJ ("OpenCL::Kernel", kernel);
1462		1662
1463	void	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]));
		1675
		1676	void
1464	info (OpenCL::Program self, cl_program_info name)	1677	info (OpenCL::Program self, cl_program_info name)
1465	PPCODE:	1678	PPCODE:
1466	INFO (Program)	1679	INFO (Program)
1467		1680
1468	void	1681	void
…		…
1484	{	1697	{
1485	SV *sv = sv_2mortal (newSV (sizes [i]));	1698	SV *sv = sv_2mortal (newSV (sizes [i]));
1486	SvUPGRADE (sv, SVt_PV);	1699	SvUPGRADE (sv, SVt_PV);
1487	SvPOK_only (sv);	1700	SvPOK_only (sv);
1488	SvCUR_set (sv, sizes [i]);	1701	SvCUR_set (sv, sizes [i]);
1489	ptrs [i] = SvPVX (sv);	1702	ptrs [i] = (void *)SvPVX (sv);
1490	PUSHs (sv);	1703	PUSHs (sv);
1491	}	1704	}
1492		1705
1493	NEED_SUCCESS (GetProgramInfo, (self, CL_PROGRAM_BINARIES , sizeof (ptrs ) n, ptrs , &size));	1706	NEED_SUCCESS (GetProgramInfo, (self, CL_PROGRAM_BINARIES , sizeof (ptrs ) n, ptrs , &size));
1494	if (size != sizeof (ptrs) n) XSRETURN_EMPTY;	1707	if (size != sizeof (ptrs) n) XSRETURN_EMPTY;
…		…
1644	set_sampler (OpenCL::Kernel self, cl_uint idx, OpenCL::Sampler value)	1857	set_sampler (OpenCL::Kernel self, cl_uint idx, OpenCL::Sampler value)
1645	CODE:	1858	CODE:
1646	clSetKernelArg (self, idx, sizeof (value), &value);	1859	clSetKernelArg (self, idx, sizeof (value), &value);
1647		1860
1648	void	1861	void
		1862	set_local (OpenCL::Kernel self, cl_uint idx, size_t size)
		1863	CODE:
		1864	clSetKernelArg (self, idx, size, 0);
		1865
		1866	void
1649	set_event (OpenCL::Kernel self, cl_uint idx, OpenCL::Event value)	1867	set_event (OpenCL::Kernel self, cl_uint idx, OpenCL::Event value)
1650	CODE:	1868	CODE:
1651	clSetKernelArg (self, idx, sizeof (value), &value);	1869	clSetKernelArg (self, idx, sizeof (value), &value);
1652		1870
1653	void	1871	void

Diff Legend

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

Comparing OpenCL/OpenCL.xs (file contents): Revision 1.31 by root, Thu Apr 19 14:36:46 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.31 by root, Thu Apr 19 14:36:46 2012 UTC vs.
Revision 1.47 by root, Tue Apr 24 13:30:49 2012 UTC