ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/OpenCL/OpenCL.xs
(Generate patch)

Comparing OpenCL/OpenCL.xs (file contents):
Revision 1.30 by root, Thu Apr 19 14:34:56 2012 UTC vs.
Revision 1.35 by root, Sat Apr 21 17:47:23 2012 UTC

… …
36typedef SV *FUTURE; 36typedef SV *FUTURE;
37 37
38/*****************************************************************************/ 38/*****************************************************************************/
39 39
40// name must include a leading underscore 40// name must include a leading underscore
41// all of this horrors would be unneceesary if somebody wrote a proper OpenGL module
42// for perl. doh.
41static void * 43static void *
42getsym (const char *name) 44glsym (const char *name)
43{ 45{
46 void *fun = 0;
47
44 #if defined I_DLFCN && defined RTLD_DEFAULT 48 #if defined I_DLFCN && defined RTLD_DEFAULT
45 #if !DLSYM_NEEDS_UNDERSCORE 49 fun = dlsym (RTLD_DEFAULT, name + 1);
46 ++name; // skip _
47 #endif
48 return dlsym (RTLD_DEFAULT, name); 50 if (!fun) fun = dlsym (RTLD_DEFAULT, name);
49 #else 51
50 return 0; 52 if (!fun)
53 {
54 static void *libgl;
55 static const char *glso[] = {
56 "libGL.so.1",
57 "libGL.so.3",
58 "libGL.so.4.0",
59 "libGL.so",
60 "/usr/lib/libGL.so",
61 "/usr/X11R6/lib/libGL.1.dylib"
62 };
63 int i;
64
65 for (i = 0; !libgl && i < sizeof (glso) / sizeof (glso [0]); ++i)
66 {
67 libgl = dlopen (glso [i], RTLD_LAZY);
68 if (libgl)
69 break;
70 }
71
72 if (libgl)
73 {
74 fun = dlsym (libgl, name + 1);
75 if (!fun) fun = dlsym (libgl, name);
76 }
77 }
51 #endif 78 #endif
79
80 return fun;
52} 81}
53 82
54/*****************************************************************************/ 83/*****************************************************************************/
55 84
56/* up to two temporary buffers */ 85/* up to two temporary buffers */
… …
178 207
179 for (i = 0; i < len; i += 2) 208 for (i = 0; i < len; i += 2)
180 { 209 {
181 cl_context_properties t = SvIV (*av_fetch (av, i , 0)); 210 cl_context_properties t = SvIV (*av_fetch (av, i , 0));
182 SV *p_sv = *av_fetch (av, i + 1, 0); 211 SV *p_sv = *av_fetch (av, i + 1, 0);
183 cl_context_properties v; 212 cl_context_properties v = SvIV (p_sv); // code below can override
184 213
185 switch (t) 214 switch (t)
186 { 215 {
216 case CL_GLX_DISPLAY_KHR:
217 if (!SvOK (p_sv))
218 {
219 void *func = glsym ("_glXGetCurrentDisplay");
220 if (func)
221 v = (cl_context_properties)((void *(*)(void))func)();
222 }
223 break;
224
225 case CL_GL_CONTEXT_KHR:
226 if (!SvOK (p_sv))
227 {
228 void *func = glsym ("_glXGetCurrentContext");
229 if (func)
230 v = (cl_context_properties)((void *(*)(void))func)();
231 }
232 break;
233
187 default: 234 default:
188 /* unknown property, treat as int */ 235 /* unknown property, treat as int */
189 v = SvIV (p_sv);
190 break; 236 break;
191 } 237 }
192 238
193 *l++ = t; 239 *l++ = t;
194 *l++ = v; 240 *l++ = v;
… …
211 clGetImageInfo (img, CL_IMAGE_ROW_PITCH, sizeof (res), &res, 0); 257 clGetImageInfo (img, CL_IMAGE_ROW_PITCH, sizeof (res), &res, 0);
212 return res; 258 return res;
213} 259}
214 260
215static cl_event * 261static cl_event *
216event_list (SV **items, int count) 262event_list (SV **items, cl_uint *rcount)
217{ 263{
264 cl_uint count = *rcount;
265
218 if (!count) 266 if (!count)
219 return 0; 267 return 0;
220 268
221 cl_event *list = tmpbuf (sizeof (cl_event) * count); 269 cl_event *list = tmpbuf (sizeof (cl_event) * count);
270 int i = 0;
222 271
223 while (count--) 272 do
273 {
274 --count;
275 if (SvOK (items [count]))
224 list [count] = SvPTROBJ ("clEnqueue", "wait_events", items [count], "OpenCL::Event"); 276 list [i++] = SvPTROBJ ("clEnqueue", "wait_events", items [count], "OpenCL::Event");
277 }
278 while (count);
225 279
280 *rcount = i;
281
226 return list; 282 return i ? list : 0;
227} 283}
228 284
229#define EVENT_LIST(items,count) \ 285#define EVENT_LIST(items,count) \
230 cl_uint event_list_count = (count); \ 286 cl_uint event_list_count = (count); \
231 cl_event *event_list_ptr = event_list (&ST (items), event_list_count) 287 cl_event *event_list_ptr = event_list (&ST (items), &event_list_count)
232 288
233#define INFO(class) \ 289#define INFO(class) \
234{ \ 290{ \
235 size_t size; \ 291 size_t size; \
236 NEED_SUCCESS (Get ## class ## Info, (self, name, 0, 0, &size)); \ 292 NEED_SUCCESS (Get ## class ## Info, (self, name, 0, 0, &size)); \
… …
809 cl_event ev = 0; 865 cl_event ev = 0;
810 STRLEN len; 866 STRLEN len;
811 char *ptr = SvPVbyte (data, len); 867 char *ptr = SvPVbyte (data, len);
812 EVENT_LIST (5, items - 5); 868 EVENT_LIST (5, items - 5);
813 869
814 NEED_SUCCESS (EnqueueReadBuffer, (self, mem, blocking, offset, len, ptr, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0)); 870 NEED_SUCCESS (EnqueueWriteBuffer, (self, mem, blocking, offset, len, ptr, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0));
815 871
816 if (ev) 872 if (ev)
817 XPUSH_NEW_OBJ ("OpenCL::Event", ev); 873 XPUSH_NEW_OBJ ("OpenCL::Event", ev);
818 874
819void 875void
… …
1264void 1320void
1265gl_object_info (OpenCL::Memory self) 1321gl_object_info (OpenCL::Memory self)
1266 PPCODE: 1322 PPCODE:
1267 cl_gl_object_type type; 1323 cl_gl_object_type type;
1268 cl_GLuint name; 1324 cl_GLuint name;
1269 NEED_SUCCESS (clGetGLObjectInfo, (self, &type, &name)); 1325 NEED_SUCCESS (GetGLObjectInfo, (self, &type, &name));
1270 EXTEND (SP, 2); 1326 EXTEND (SP, 2);
1271 PUSHs (sv_2mortal (newSVuv (type))); 1327 PUSHs (sv_2mortal (newSVuv (type)));
1272 PUSHs (sv_2mortal (newSVuv (name))); 1328 PUSHs (sv_2mortal (newSVuv (name)));
1273 1329
1274#endif 1330#endif
… …
1319 1375
1320void 1376void
1321target (OpenCL::Image self) 1377target (OpenCL::Image self)
1322 PPCODE: 1378 PPCODE:
1323 cl_GLenum value [1]; 1379 cl_GLenum value [1];
1324 NEED_SUCCESS (GetGlTextureInfo, (self, CL_GL_TEXTURE_TARGET, sizeof (value), value, 0)); 1380 NEED_SUCCESS (GetGLTextureInfo, (self, CL_GL_TEXTURE_TARGET, sizeof (value), value, 0));
1325 EXTEND (SP, 1); 1381 EXTEND (SP, 1);
1326 const int i = 0; 1382 const int i = 0;
1327 PUSHs (sv_2mortal (newSVuv (value [i]))); 1383 PUSHs (sv_2mortal (newSVuv (value [i])));
1328 1384
1329void 1385void
1330gl_mipmap_level (OpenCL::Image self) 1386gl_mipmap_level (OpenCL::Image self)
1331 PPCODE: 1387 PPCODE:
1332 cl_GLint value [1]; 1388 cl_GLint value [1];
1333 NEED_SUCCESS (GetGlTextureInfo, (self, CL_GL_MIPMAP_LEVEL, sizeof (value), value, 0)); 1389 NEED_SUCCESS (GetGLTextureInfo, (self, CL_GL_MIPMAP_LEVEL, sizeof (value), value, 0));
1334 EXTEND (SP, 1); 1390 EXTEND (SP, 1);
1335 const int i = 0; 1391 const int i = 0;
1336 PUSHs (sv_2mortal (newSViv (value [i]))); 1392 PUSHs (sv_2mortal (newSViv (value [i])));
1337 1393
1338#END:gl_texture 1394#END:gl_texture
… …
1644set_sampler (OpenCL::Kernel self, cl_uint idx, OpenCL::Sampler value) 1700set_sampler (OpenCL::Kernel self, cl_uint idx, OpenCL::Sampler value)
1645 CODE: 1701 CODE:
1646 clSetKernelArg (self, idx, sizeof (value), &value); 1702 clSetKernelArg (self, idx, sizeof (value), &value);
1647 1703
1648void 1704void
1705set_local (OpenCL::Kernel self, cl_uint idx, size_t size)
1706 CODE:
1707 clSetKernelArg (self, idx, size, 0);
1708
1709void
1649set_event (OpenCL::Kernel self, cl_uint idx, OpenCL::Event value) 1710set_event (OpenCL::Kernel self, cl_uint idx, OpenCL::Event value)
1650 CODE: 1711 CODE:
1651 clSetKernelArg (self, idx, sizeof (value), &value); 1712 clSetKernelArg (self, idx, sizeof (value), &value);
1652 1713
1653void 1714void

Diff Legend

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