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

Comparing OpenCL/OpenCL.xs (file contents):
Revision 1.34 by root, Fri Apr 20 19:36:00 2012 UTC vs.
Revision 1.37 by root, Sat Apr 21 18:49:21 2012 UTC

 #include "XSUB.h"
 #ifdef I_DLFCN
   #include <dlfcn.h>
 #endif
+// how stupid is that, the 1.2 header files define CL_VERSION_1_1,
+// but then fail to define the api functions unless you ALSO define
+// this. This breaks 100% of the opencl 1.1 apps, for what reason?
+// after all, the functions are deprecated, not removed.
+// in addition, you cannot test for this in any future-proof way.
+// each time a new opencl version comes out, you need to make a new
+// release.
+#define CL_USE_DEPRECATED_OPENCL_1_1_APIS
+#define CL_USE_DEPRECATED_OPENCL_1_2_APIS /* just guessing, you stupid idiots */
 #ifdef __APPLE__
   #include <OpenCL/opencl.h>
 #else
   #include <CL/opencl.h>
   enum { buffers = 3 };
   static int idx;
   static void *buf [buffers];
   static size_t len [buffers];
-  idx = ++idx % buffers;
+  idx = (idx + 1) % buffers;
   if (len [idx] < size)
     {
       free (buf [idx]);
       len [idx] = ((size + 31) & ~4095) + 4096 - 32;
   clGetImageInfo (img, CL_IMAGE_ROW_PITCH, sizeof (res), &res, 0);
   return res;
 }
 static cl_event *
-event_list (SV **items, int count)
+event_list (SV **items, cl_uint *rcount)
 {
+  cl_uint count = *rcount;
   if (!count)
     return 0;
   cl_event *list = tmpbuf (sizeof (cl_event) * count);
+  int i = 0;
-  while (count--)
+  do
+    {
+      --count;
+      if (SvOK (items [count]))
-    list [count] = SvPTROBJ ("clEnqueue", "wait_events", items [count], "OpenCL::Event");
+        list [i++] = SvPTROBJ ("clEnqueue", "wait_events", items [count], "OpenCL::Event");
+    }
+  while (count);
+  *rcount = i;
-  return list;
+  return i ? list : 0;
 }
 #define EVENT_LIST(items,count) \
   cl_uint event_list_count = (count); \
-  cl_event *event_list_ptr = event_list (&ST (items), event_list_count)
+  cl_event *event_list_ptr = event_list (&ST (items), &event_list_count)
 #define INFO(class) \
 { \
 	size_t size; \
 	NEED_SUCCESS (Get ## class ## Info, (self, name, 0, 0, &size)); \
 }
 cl_int
 errno ()
 	CODE:
-        errno = res;
+        RETVAL = res;
+	OUTPUT:
+        RETVAL
 const char *
 err2str (cl_int err)
 const char *
 context_from_type (cl_context_properties *properties = 0, cl_device_type type = CL_DEVICE_TYPE_DEFAULT, FUTURE notify = 0)
 	PPCODE:
         NEED_SUCCESS_ARG (cl_context ctx, CreateContextFromType, (properties, type, 0, 0, &res));
         XPUSH_NEW_OBJ ("OpenCL::Context", ctx);
+#if 0
 void
 context (cl_context_properties *properties = 0, FUTURE devices, FUTURE notify = 0)
 	PPCODE:
 	/* der Gipfel der Kunst */
+#endif
 void
 wait_for_events (...)
 	CODE:
         EVENT_LIST (0, items);
         if (!(flags & (CL_MEM_USE_HOST_PTR | CL_MEM_COPY_HOST_PTR)))
           croak ("OpenCL::Context::buffer_sv: you have to specify use or copy host ptr when buffer data is given, use $context->buffer instead?");
         NEED_SUCCESS_ARG (cl_mem mem, CreateBuffer, (self, flags, len, ptr, &res));
         XPUSH_NEW_OBJ ("OpenCL::BufferObj", mem);
+#if !defined CL_VERSION_1_2 || defined CL_USE_DEPRECATED_OPENCL_1_1_APIS
 void
 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)
 	PPCODE:
 	STRLEN len;
         char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0;
         char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0;
         const cl_image_format format = { channel_order, channel_type };
 	NEED_SUCCESS_ARG (cl_mem mem, CreateImage3D, (self, flags, &format, width, height, depth, row_pitch, slice_pitch, ptr, &res));
         XPUSH_NEW_OBJ ("OpenCL::Image3D", mem);
+#endif
 #if cl_apple_gl_sharing || cl_khr_gl_sharing
 void
 gl_buffer (OpenCL::Context self, cl_mem_flags flags, cl_GLuint bufobj)
 	PPCODE:
         NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLBuffer, (self, flags, bufobj, &res));
         XPUSH_NEW_OBJ ("OpenCL::BufferObj", mem);
+#if !defined CL_VERSION_1_2 || defined CL_USE_DEPRECATED_OPENCL_1_1_APIS
 void
 gl_texture2d (OpenCL::Context self, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture)
 	PPCODE:
 	NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture2D, (self, flags, target, miplevel, texture, &res));
         XPUSH_NEW_OBJ ("OpenCL::Image2D", mem);
 void
 gl_texture3d (OpenCL::Context self, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture)
 	PPCODE:
 	NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture3D, (self, flags, target, miplevel, texture, &res));
         XPUSH_NEW_OBJ ("OpenCL::Image3D", mem);
+#endif
 void
 gl_renderbuffer (OpenCL::Context self, cl_mem_flags flags, cl_GLuint renderbuffer)
 	PPCODE:
 	NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLRenderbuffer, (self, flags, renderbuffer, &res));
         size_t min_len = host_row_pitch * host_slice_pitch * region [2];
         if (len < min_len)
           croak ("clEnqueueWriteImage: data string is shorter than what would be transferred");
-        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));
+        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));
         if (ev)
           XPUSH_NEW_OBJ ("OpenCL::Event", ev);
 void
         size_t min_len = slice_pitch ? slice_pitch * depth : row_pitch * height;
         if (len < min_len)
           croak ("clEnqueueWriteImage: data string is shorter than what would be transferred");
-        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));
+        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));
         if (ev)
           XPUSH_NEW_OBJ ("OpenCL::Event", ev);
 void
               gwo [i] = SvIV (AvARRAY (SvRV (global_work_offset))[i]);
           }
         if (SvOK (local_work_size))
           {
-            if (SvOK (local_work_size) && !SvROK (local_work_size) || SvTYPE (SvRV (local_work_size)) != SVt_PVAV)
+            if ((SvOK (local_work_size) && !SvROK (local_work_size)) || SvTYPE (SvRV (local_work_size)) != SVt_PVAV)
               croak ("clEnqueueNDRangeKernel: global_work_size must be undef or an array reference");
             if (AvFILLp (SvRV (local_work_size)) + 1 != gws_len)
               croak ("clEnqueueNDRangeKernel: local_work_local must be undef or an array of same size as global_work_size");
 void
 enqueue_acquire_gl_objects (OpenCL::Queue self, SV *objects, ...)
         ALIAS:
         enqueue_release_gl_objects = 1
-	CODE:
+	PPCODE:
         if (!SvROK (objects) || SvTYPE (SvRV (objects)) != SVt_PVAV)
           croak ("OpenCL::Queue::enqueue_acquire/release_gl_objects argument 'objects' must be an arrayref with memory objects, in call");
 	cl_event ev = 0;
         EVENT_LIST (2, items - 2);
         if (ev)
           XPUSH_NEW_OBJ ("OpenCL::Event", ev);
 #endif
+#if !defined CL_VERSION_1_2 || defined CL_USE_DEPRECATED_OPENCL_1_1_APIS
 void
 enqueue_marker (OpenCL::Queue self)
 	PPCODE:
 	cl_event ev;
         NEED_SUCCESS (EnqueueMarker, (self, &ev));
 void
 enqueue_barrier (OpenCL::Queue self)
 	CODE:
         NEED_SUCCESS (EnqueueBarrier, (self));
+#endif
 void
 flush (OpenCL::Queue self)
 	CODE:
         NEED_SUCCESS (Flush, (self));
           {
             SV *sv = sv_2mortal (newSV (sizes [i]));
             SvUPGRADE (sv, SVt_PV);
             SvPOK_only (sv);
             SvCUR_set (sv, sizes [i]);
-            ptrs [i] = SvPVX (sv);
+            ptrs [i] = (void *)SvPVX (sv);
             PUSHs (sv);
           }
         NEED_SUCCESS (GetProgramInfo, (self, CL_PROGRAM_BINARIES    , sizeof (*ptrs ) * n, ptrs , &size));
         if (size != sizeof (*ptrs) * n) XSRETURN_EMPTY;

Diff Legend

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

Comparing OpenCL/OpenCL.xs (file contents): Revision 1.34 by root, Fri Apr 20 19:36:00 2012 UTC vs. Revision 1.37 by root, Sat Apr 21 18:49:21 2012 UTC

Diff Legend

Comparing OpenCL/OpenCL.xs (file contents):
Revision 1.34 by root, Fri Apr 20 19:36:00 2012 UTC vs.
Revision 1.37 by root, Sat Apr 21 18:49:21 2012 UTC