--- OpenCL/OpenCL.xs	2011/11/15 21:13:42	1.4
+++ OpenCL/OpenCL.xs	2011/11/20 22:29:36	1.15
@@ -22,6 +22,33 @@
 typedef cl_program           OpenCL__Program;
 typedef cl_kernel            OpenCL__Kernel;
 typedef cl_event             OpenCL__Event;
+typedef cl_event             OpenCL__UserEvent;
+
+typedef SV *FUTURE;
+
+/*****************************************************************************/
+
+/* up to two temporary buffers */
+static void *
+tmpbuf (size_t size)
+{
+  static int idx;
+  static void *buf [2];
+  static size_t len [2];
+
+  idx ^= 1;
+
+  if (len [idx] < size)
+    {
+      free (buf [idx]);
+      len [idx] = ((size + 31) & ~4095) + 4096 - 32;
+      buf [idx] = malloc (len [idx]);
+    }
+
+  return buf [idx];
+}
+
+/*****************************************************************************/
 
 typedef struct
 {
@@ -65,36 +92,30 @@
   return iv2str (err, errstr, sizeof (errstr) / sizeof (errstr [0]), "ERROR(%d)");
 }
 
-#define FAIL(name,res) \
+/*****************************************************************************/
+
+static cl_int res;
+
+#define FAIL(name) \
   croak ("cl" # name ": %s", err2str (res));
 
 #define NEED_SUCCESS(name,args) \
   do { \
-    cl_int res = cl ## name args; \
+    res = cl ## name args; \
     \
     if (res) \
-      FAIL (name, res); \
+      FAIL (name); \
   } while (0)
 
-#define NEW_MORTAL_OBJ(class,ptr) sv_setref_pv (sv_newmortal (), class, ptr)
-#define XPUSH_NEW_OBJ(class,ptr) XPUSHs (NEW_MORTAL_OBJ (class, ptr))
+#define NEED_SUCCESS_ARG(retdecl, name, args) \
+  retdecl = cl ## name args; \
+  if (res) \
+    FAIL (name);
 
-/*TODO*/
-#define EVENT_LIST(items,count) cl_uint event_list_count = 0; cl_event *event_list_ptr = 0
+/*****************************************************************************/
 
-#define INFO(class) \
-{ \
-  	size_t size; \
-        SV *sv; \
- \
-  	NEED_SUCCESS (Get ## class ## Info, (this, name, 0, 0, &size)); \
-        sv = sv_2mortal (newSV (size)); \
-        SvUPGRADE (sv, SVt_PV); \
-        SvPOK_only (sv); \
-        SvCUR_set (sv, size); \
-  	NEED_SUCCESS (Get ## class ## Info, (this, name, size, SvPVX (sv), 0)); \
-        XPUSHs (sv); \
-}
+#define NEW_MORTAL_OBJ(class,ptr) sv_setref_pv (sv_newmortal (), class, ptr)
+#define XPUSH_NEW_OBJ(class,ptr) XPUSHs (NEW_MORTAL_OBJ (class, ptr))
 
 static void *
 SvPTROBJ (const char *func, const char *svname, SV *sv, const char *pkg)
@@ -105,20 +126,41 @@
    croak ("%s: %s is not of type %s", func, svname, pkg);
 }
 
-static void *
-tmpbuf (size_t size)
+/*****************************************************************************/
+
+static size_t
+img_row_pitch (cl_mem img)
 {
-  static void *buf;
-  static size_t len;
+  size_t res;
+  clGetImageInfo (img, CL_IMAGE_ROW_PITCH, sizeof (res), &res, 0);
+  return res;
+}
 
-  if (len < size)
-    {
-      free (buf);
-      len = ((size + 31) & ~4095) + 4096 - 32;
-      buf = malloc (len);
-    }
+static cl_event *
+event_list (SV **items, int count)
+{
+  cl_event *list = tmpbuf (sizeof (cl_event) * count);
+
+  while (count--)
+    list [count] = SvPTROBJ ("clEnqueue", "wait_events", items [count], "OpenCL::Event");
 
-  return buf;
+  return list;
+}
+
+#define EVENT_LIST(items,count) \
+  cl_uint event_list_count = (count); \
+  cl_event *event_list_ptr = event_list (&ST (items), event_list_count)
+
+#define INFO(class) \
+{ \
+  	size_t size; \
+  	NEED_SUCCESS (Get ## class ## Info, (this, name, 0, 0, &size)); \
+        SV *sv = sv_2mortal (newSV (size)); \
+        SvUPGRADE (sv, SVt_PV); \
+        SvPOK_only (sv); \
+        SvCUR_set (sv, size); \
+  	NEED_SUCCESS (Get ## class ## Info, (this, name, size, SvPVX (sv), 0)); \
+        XPUSHs (sv); \
 }
 
 MODULE = OpenCL		PACKAGE = OpenCL
@@ -129,22 +171,28 @@
 {
         HV *stash = gv_stashpv ("OpenCL", 1);
         static const ivstr *civ, const_iv[] = {
-          { sizeof (cl_char  ), "SIZEOF_CHAR"  },
-          { sizeof (cl_uchar ), "SIZEOF_UCHAR" },
-          { sizeof (cl_short ), "SIZEOF_SHORT" },
-          { sizeof (cl_ushort), "SIZEOF_USHORT"},
-          { sizeof (cl_int   ), "SIZEOF_INT"   },
-          { sizeof (cl_uint  ), "SIZEOF_UINT"  },
-          { sizeof (cl_long  ), "SIZEOF_LONG"  },
-          { sizeof (cl_ulong ), "SIZEOF_ULONG" },
-          { sizeof (cl_half  ), "SIZEOF_HALF"  },
-          { sizeof (cl_float ), "SIZEOF_FLOAT" },
+          { sizeof (cl_char  ), "SIZEOF_CHAR"   },
+          { sizeof (cl_uchar ), "SIZEOF_UCHAR"  },
+          { sizeof (cl_short ), "SIZEOF_SHORT"  },
+          { sizeof (cl_ushort), "SIZEOF_USHORT" },
+          { sizeof (cl_int   ), "SIZEOF_INT"    },
+          { sizeof (cl_uint  ), "SIZEOF_UINT"   },
+          { sizeof (cl_long  ), "SIZEOF_LONG"   },
+          { sizeof (cl_ulong ), "SIZEOF_ULONG"  },
+          { sizeof (cl_half  ), "SIZEOF_HALF"   },
+          { sizeof (cl_float ), "SIZEOF_FLOAT"  },
+          { sizeof (cl_double), "SIZEOF_DOUBLE" },
 #include "constiv.h"
         };
         for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
           newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
 }
 
+cl_int
+errno ()
+	CODE:
+        errno = res;
+
 const char *
 err2str (cl_int err)
 
@@ -154,7 +202,6 @@
 void
 platforms ()
 	PPCODE:
-{
 	cl_platform_id *list;
         cl_uint count;
         int i;
@@ -166,28 +213,23 @@
         EXTEND (SP, count);
         for (i = 0; i < count; ++i)
           PUSHs (NEW_MORTAL_OBJ ("OpenCL::Platform", list [i]));
-}
 
 void
-context_from_type_simple (cl_device_type type = CL_DEVICE_TYPE_DEFAULT)
+context_from_type (FUTURE properties = 0, cl_device_type type = CL_DEVICE_TYPE_DEFAULT, FUTURE notify = 0)
 	PPCODE:
-{
-	cl_int res;
-  	cl_context ctx = clCreateContextFromType (0, type, 0, 0, &res);
-
-        if (res)
-          FAIL (CreateContextFromType, res);
-
+        NEED_SUCCESS_ARG (cl_context ctx, CreateContextFromType, (0, type, 0, 0, &res));
         XPUSH_NEW_OBJ ("OpenCL::Context", ctx);
-}
+
+void
+context (FUTURE properties, FUTURE devices, FUTURE notify = 0)
+	PPCODE:
+	/* der Gipfel der Kunst */
 
 void
 wait_for_events (...)
 	CODE:
-{
         EVENT_LIST (0, items);
         NEED_SUCCESS (WaitForEvents, (event_list_count, event_list_ptr));
-}
 
 PROTOTYPES: DISABLE
 
@@ -198,10 +240,73 @@
 	PPCODE:
         INFO (Platform)
 
+#BEGIN:platform
+
+void
+profile (OpenCL::Platform this)
+ PPCODE:
+ size_t size;
+ NEED_SUCCESS (GetPlatformInfo, (this, CL_PLATFORM_PROFILE,    0,     0, &size));
+ char *value = tmpbuf (size);
+ NEED_SUCCESS (GetPlatformInfo, (this, CL_PLATFORM_PROFILE, size, value,     0));
+ int i, n = 1;
+ EXTEND (SP, n);
+ for (i = 0; i < n; ++i)
+ PUSHs (sv_2mortal (newSVpv (value, 0)));
+
+void
+version (OpenCL::Platform this)
+ PPCODE:
+ size_t size;
+ NEED_SUCCESS (GetPlatformInfo, (this, CL_PLATFORM_VERSION,    0,     0, &size));
+ char *value = tmpbuf (size);
+ NEED_SUCCESS (GetPlatformInfo, (this, CL_PLATFORM_VERSION, size, value,     0));
+ int i, n = 1;
+ EXTEND (SP, n);
+ for (i = 0; i < n; ++i)
+ PUSHs (sv_2mortal (newSVpv (value, 0)));
+
+void
+name (OpenCL::Platform this)
+ PPCODE:
+ size_t size;
+ NEED_SUCCESS (GetPlatformInfo, (this, CL_PLATFORM_NAME,    0,     0, &size));
+ char *value = tmpbuf (size);
+ NEED_SUCCESS (GetPlatformInfo, (this, CL_PLATFORM_NAME, size, value,     0));
+ int i, n = 1;
+ EXTEND (SP, n);
+ for (i = 0; i < n; ++i)
+ PUSHs (sv_2mortal (newSVpv (value, 0)));
+
+void
+vendor (OpenCL::Platform this)
+ PPCODE:
+ size_t size;
+ NEED_SUCCESS (GetPlatformInfo, (this, CL_PLATFORM_VENDOR,    0,     0, &size));
+ char *value = tmpbuf (size);
+ NEED_SUCCESS (GetPlatformInfo, (this, CL_PLATFORM_VENDOR, size, value,     0));
+ int i, n = 1;
+ EXTEND (SP, n);
+ for (i = 0; i < n; ++i)
+ PUSHs (sv_2mortal (newSVpv (value, 0)));
+
+void
+extensions (OpenCL::Platform this)
+ PPCODE:
+ size_t size;
+ NEED_SUCCESS (GetPlatformInfo, (this, CL_PLATFORM_EXTENSIONS,    0,     0, &size));
+ char *value = tmpbuf (size);
+ NEED_SUCCESS (GetPlatformInfo, (this, CL_PLATFORM_EXTENSIONS, size, value,     0));
+ int i, n = 1;
+ EXTEND (SP, n);
+ for (i = 0; i < n; ++i)
+ PUSHs (sv_2mortal (newSVpv (value, 0)));
+
+#END:platform
+
 void
 devices (OpenCL::Platform this, cl_device_type type = CL_DEVICE_TYPE_ALL)
 	PPCODE:
-{
 	cl_device_id *list;
         cl_uint count;
         int i;
@@ -213,21 +318,30 @@
         EXTEND (SP, count);
         for (i = 0; i < count; ++i)
           PUSHs (sv_setref_pv (sv_newmortal (), "OpenCL::Device", list [i]));
-}
 
 void
-context_from_type_simple (OpenCL::Platform this, cl_device_type type = CL_DEVICE_TYPE_DEFAULT)
+context (OpenCL::Platform this, FUTURE properties, SV *devices, FUTURE notify = 0)
 	PPCODE:
-{
-	cl_int res;
-	cl_context_properties props[] = { CL_CONTEXT_PLATFORM, (cl_context_properties)this, 0 };
-  	cl_context ctx = clCreateContextFromType (props, type, 0, 0, &res);
+        if (!SvROK (devices) || SvTYPE (SvRV (devices)) != SVt_PVAV)
+          croak ("OpenCL::Platform argument 'device' must be an arrayref with device objects, in call");
+
+        AV *av = (AV *)SvRV (devices);
+        cl_uint num_devices = av_len (av) + 1;
+        cl_device_id *device_list = tmpbuf (sizeof (cl_device_id) * num_devices);
+        int i;
 
-        if (res)
-          FAIL (CreateContextFromType, res);
+        for (i = num_devices; i--; )
+          device_list [i] = SvPTROBJ ("clCreateContext", "devices", *av_fetch (av, i, 0), "OpenCL::Device");
 
+  	NEED_SUCCESS_ARG (cl_context ctx, CreateContext, (0, num_devices, device_list, 0, 0, &res));
+        XPUSH_NEW_OBJ ("OpenCL::Context", ctx);
+
+void
+context_from_type (OpenCL::Platform this, FUTURE properties = 0, cl_device_type type = CL_DEVICE_TYPE_DEFAULT, FUTURE notify = 0)
+	PPCODE:
+	cl_context_properties props[] = { CL_CONTEXT_PLATFORM, (cl_context_properties)this, 0 };
+        NEED_SUCCESS_ARG (cl_context ctx, CreateContextFromType, (props, type, 0, 0, &res));
         XPUSH_NEW_OBJ ("OpenCL::Context", ctx);
-}
 
 MODULE = OpenCL		PACKAGE = OpenCL::Device
 
@@ -236,18 +350,637 @@
 	PPCODE:
         INFO (Device)
 
-void
-context_simple (OpenCL::Device this)
-	PPCODE:
-{
-	cl_int res;
-  	cl_context ctx = clCreateContext (0, 1, &this, 0, 0, &res);
+#BEGIN:device
 
-        if (res)
-          FAIL (CreateContext, res);
+void
+type (OpenCL::Device this)
+ PPCODE:
+ cl_device_type value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_TYPE, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSViv (value [i])));
+
+void
+vendor_id (OpenCL::Device this)
+ PPCODE:
+ cl_uint value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_VENDOR_ID, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+max_compute_units (OpenCL::Device this)
+ PPCODE:
+ cl_uint value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_MAX_COMPUTE_UNITS, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+max_work_item_dimensions (OpenCL::Device this)
+ PPCODE:
+ cl_uint value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_MAX_WORK_ITEM_DIMENSIONS, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+max_work_group_size (OpenCL::Device this)
+ PPCODE:
+ size_t value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_MAX_WORK_GROUP_SIZE, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+max_work_item_sizes (OpenCL::Device this)
+ PPCODE:
+ size_t size;
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_MAX_WORK_ITEM_SIZES,    0,     0, &size));
+ size_t *value = tmpbuf (size);
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_MAX_WORK_ITEM_SIZES, size, value,     0));
+ int i, n = size / sizeof (*value);
+ EXTEND (SP, n);
+ for (i = 0; i < n; ++i)
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+preferred_vector_width_char (OpenCL::Device this)
+ PPCODE:
+ cl_uint value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_PREFERRED_VECTOR_WIDTH_CHAR, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+preferred_vector_width_short (OpenCL::Device this)
+ PPCODE:
+ cl_uint value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_PREFERRED_VECTOR_WIDTH_SHORT, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+preferred_vector_width_int (OpenCL::Device this)
+ PPCODE:
+ cl_uint value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_PREFERRED_VECTOR_WIDTH_INT, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+preferred_vector_width_long (OpenCL::Device this)
+ PPCODE:
+ cl_uint value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_PREFERRED_VECTOR_WIDTH_LONG, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+preferred_vector_width_float (OpenCL::Device this)
+ PPCODE:
+ cl_uint value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_PREFERRED_VECTOR_WIDTH_FLOAT, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+preferred_vector_width_double (OpenCL::Device this)
+ PPCODE:
+ cl_uint value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_PREFERRED_VECTOR_WIDTH_DOUBLE, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+max_clock_frequency (OpenCL::Device this)
+ PPCODE:
+ cl_uint value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_MAX_CLOCK_FREQUENCY, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+address_bits (OpenCL::Device this)
+ PPCODE:
+ cl_bitfield value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_ADDRESS_BITS, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+max_read_image_args (OpenCL::Device this)
+ PPCODE:
+ cl_uint value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_MAX_READ_IMAGE_ARGS, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+max_write_image_args (OpenCL::Device this)
+ PPCODE:
+ cl_uint value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_MAX_WRITE_IMAGE_ARGS, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+max_mem_alloc_size (OpenCL::Device this)
+ PPCODE:
+ cl_ulong value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_MAX_MEM_ALLOC_SIZE, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+image2d_max_width (OpenCL::Device this)
+ PPCODE:
+ size_t value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_IMAGE2D_MAX_WIDTH, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+image2d_max_height (OpenCL::Device this)
+ PPCODE:
+ size_t value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_IMAGE2D_MAX_HEIGHT, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+image3d_max_width (OpenCL::Device this)
+ PPCODE:
+ size_t value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_IMAGE3D_MAX_WIDTH, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+image3d_max_height (OpenCL::Device this)
+ PPCODE:
+ size_t value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_IMAGE3D_MAX_HEIGHT, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+image3d_max_depth (OpenCL::Device this)
+ PPCODE:
+ size_t value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_IMAGE3D_MAX_DEPTH, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+image_support (OpenCL::Device this)
+ PPCODE:
+ cl_uint value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_IMAGE_SUPPORT, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+max_parameter_size (OpenCL::Device this)
+ PPCODE:
+ size_t value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_MAX_PARAMETER_SIZE, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+max_samplers (OpenCL::Device this)
+ PPCODE:
+ cl_uint value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_MAX_SAMPLERS, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+mem_base_addr_align (OpenCL::Device this)
+ PPCODE:
+ cl_uint value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_MEM_BASE_ADDR_ALIGN, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+min_data_type_align_size (OpenCL::Device this)
+ PPCODE:
+ cl_uint value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_MIN_DATA_TYPE_ALIGN_SIZE, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+single_fp_config (OpenCL::Device this)
+ PPCODE:
+ cl_device_fp_config value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_SINGLE_FP_CONFIG, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+global_mem_cache_type (OpenCL::Device this)
+ PPCODE:
+ cl_device_mem_cache_type value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_GLOBAL_MEM_CACHE_TYPE, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+global_mem_cacheline_size (OpenCL::Device this)
+ PPCODE:
+ cl_uint value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_GLOBAL_MEM_CACHELINE_SIZE, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+global_mem_cache_size (OpenCL::Device this)
+ PPCODE:
+ cl_ulong value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_GLOBAL_MEM_CACHE_SIZE, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+global_mem_size (OpenCL::Device this)
+ PPCODE:
+ cl_ulong value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_GLOBAL_MEM_SIZE, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+max_constant_buffer_size (OpenCL::Device this)
+ PPCODE:
+ cl_ulong value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_MAX_CONSTANT_BUFFER_SIZE, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+max_constant_args (OpenCL::Device this)
+ PPCODE:
+ cl_uint value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_MAX_CONSTANT_ARGS, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+local_mem_type (OpenCL::Device this)
+ PPCODE:
+ cl_device_local_mem_type value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_LOCAL_MEM_TYPE, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+local_mem_size (OpenCL::Device this)
+ PPCODE:
+ cl_ulong value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_LOCAL_MEM_SIZE, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+error_correction_support (OpenCL::Device this)
+ PPCODE:
+ cl_bool value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_ERROR_CORRECTION_SUPPORT, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (value [i] ? &PL_sv_yes : &PL_sv_no));
+
+void
+profiling_timer_resolution (OpenCL::Device this)
+ PPCODE:
+ size_t value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_PROFILING_TIMER_RESOLUTION, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+endian_little (OpenCL::Device this)
+ PPCODE:
+ cl_bool value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_ENDIAN_LITTLE, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (value [i] ? &PL_sv_yes : &PL_sv_no));
+
+void
+available (OpenCL::Device this)
+ PPCODE:
+ cl_bool value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_AVAILABLE, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (value [i] ? &PL_sv_yes : &PL_sv_no));
+
+void
+compiler_available (OpenCL::Device this)
+ PPCODE:
+ cl_bool value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_COMPILER_AVAILABLE, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (value [i] ? &PL_sv_yes : &PL_sv_no));
+
+void
+execution_capabilities (OpenCL::Device this)
+ PPCODE:
+ cl_device_exec_capabilities value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_EXECUTION_CAPABILITIES, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+properties (OpenCL::Device this)
+ PPCODE:
+ cl_command_queue_properties value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_QUEUE_PROPERTIES, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSViv (value [i])));
+
+void
+platform (OpenCL::Device this)
+ PPCODE:
+ cl_platform_id value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_PLATFORM, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ {
+   PUSHs (NEW_MORTAL_OBJ ("OpenCL::Platform", value [i]));
+ }
+
+void
+name (OpenCL::Device this)
+ PPCODE:
+ size_t size;
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_NAME,    0,     0, &size));
+ char *value = tmpbuf (size);
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_NAME, size, value,     0));
+ int i, n = 1;
+ EXTEND (SP, n);
+ for (i = 0; i < n; ++i)
+ PUSHs (sv_2mortal (newSVpv (value, 0)));
+
+void
+vendor (OpenCL::Device this)
+ PPCODE:
+ size_t size;
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_VENDOR,    0,     0, &size));
+ char *value = tmpbuf (size);
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_VENDOR, size, value,     0));
+ int i, n = 1;
+ EXTEND (SP, n);
+ for (i = 0; i < n; ++i)
+ PUSHs (sv_2mortal (newSVpv (value, 0)));
+
+void
+driver_version (OpenCL::Device this)
+ PPCODE:
+ size_t size;
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DRIVER_VERSION,    0,     0, &size));
+ char *value = tmpbuf (size);
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DRIVER_VERSION, size, value,     0));
+ int i, n = 1;
+ EXTEND (SP, n);
+ for (i = 0; i < n; ++i)
+ PUSHs (sv_2mortal (newSVpv (value, 0)));
+
+void
+profile (OpenCL::Device this)
+ PPCODE:
+ size_t size;
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_PROFILE,    0,     0, &size));
+ char *value = tmpbuf (size);
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_PROFILE, size, value,     0));
+ int i, n = 1;
+ EXTEND (SP, n);
+ for (i = 0; i < n; ++i)
+ PUSHs (sv_2mortal (newSVpv (value, 0)));
+
+void
+version (OpenCL::Device this)
+ PPCODE:
+ size_t size;
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_VERSION,    0,     0, &size));
+ char *value = tmpbuf (size);
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_VERSION, size, value,     0));
+ int i, n = 1;
+ EXTEND (SP, n);
+ for (i = 0; i < n; ++i)
+ PUSHs (sv_2mortal (newSVpv (value, 0)));
+
+void
+extensions (OpenCL::Device this)
+ PPCODE:
+ size_t size;
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_EXTENSIONS,    0,     0, &size));
+ char *value = tmpbuf (size);
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_EXTENSIONS, size, value,     0));
+ int i, n = 1;
+ EXTEND (SP, n);
+ for (i = 0; i < n; ++i)
+ PUSHs (sv_2mortal (newSVpv (value, 0)));
+
+void
+preferred_vector_width_half (OpenCL::Device this)
+ PPCODE:
+ cl_uint value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_PREFERRED_VECTOR_WIDTH_HALF, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+native_vector_width_char (OpenCL::Device this)
+ PPCODE:
+ cl_uint value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_NATIVE_VECTOR_WIDTH_CHAR, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+native_vector_width_short (OpenCL::Device this)
+ PPCODE:
+ cl_uint value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_NATIVE_VECTOR_WIDTH_SHORT, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+native_vector_width_int (OpenCL::Device this)
+ PPCODE:
+ cl_uint value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_NATIVE_VECTOR_WIDTH_INT, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+native_vector_width_long (OpenCL::Device this)
+ PPCODE:
+ cl_uint value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_NATIVE_VECTOR_WIDTH_LONG, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+native_vector_width_float (OpenCL::Device this)
+ PPCODE:
+ cl_uint value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_NATIVE_VECTOR_WIDTH_FLOAT, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+native_vector_width_double (OpenCL::Device this)
+ PPCODE:
+ cl_uint value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_NATIVE_VECTOR_WIDTH_DOUBLE, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+native_vector_width_half (OpenCL::Device this)
+ PPCODE:
+ cl_uint value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_NATIVE_VECTOR_WIDTH_HALF, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+double_fp_config (OpenCL::Device this)
+ PPCODE:
+ cl_device_fp_config value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_DOUBLE_FP_CONFIG, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+half_fp_config (OpenCL::Device this)
+ PPCODE:
+ cl_device_fp_config value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_HALF_FP_CONFIG, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+host_unified_memory (OpenCL::Device this)
+ PPCODE:
+ cl_bool value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_HOST_UNIFIED_MEMORY, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (value [i] ? &PL_sv_yes : &PL_sv_no));
+
+void
+parent_device_ext (OpenCL::Device this)
+ PPCODE:
+ cl_device_id value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_PARENT_DEVICE_EXT, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ {
+   PUSHs (NEW_MORTAL_OBJ ("OpenCL::Device", value [i]));
+ }
+
+void
+partition_types_ext (OpenCL::Device this)
+ PPCODE:
+ size_t size;
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_PARTITION_TYPES_EXT,    0,     0, &size));
+ cl_device_partition_property_ext *value = tmpbuf (size);
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_PARTITION_TYPES_EXT, size, value,     0));
+ int i, n = size / sizeof (*value);
+ EXTEND (SP, n);
+ for (i = 0; i < n; ++i)
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+affinity_domains_ext (OpenCL::Device this)
+ PPCODE:
+ size_t size;
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_AFFINITY_DOMAINS_EXT,    0,     0, &size));
+ cl_device_partition_property_ext *value = tmpbuf (size);
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_AFFINITY_DOMAINS_EXT, size, value,     0));
+ int i, n = size / sizeof (*value);
+ EXTEND (SP, n);
+ for (i = 0; i < n; ++i)
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+reference_count_ext  (OpenCL::Device this)
+ PPCODE:
+ cl_uint value [1];
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_REFERENCE_COUNT_EXT , sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+partition_style_ext (OpenCL::Device this)
+ PPCODE:
+ size_t size;
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_PARTITION_STYLE_EXT,    0,     0, &size));
+ cl_device_partition_property_ext *value = tmpbuf (size);
+ NEED_SUCCESS (GetDeviceInfo, (this, CL_DEVICE_PARTITION_STYLE_EXT, size, value,     0));
+ int i, n = size / sizeof (*value);
+ EXTEND (SP, n);
+ for (i = 0; i < n; ++i)
+ PUSHs (sv_2mortal (newSVuv (value [i])));
 
-        XPUSH_NEW_OBJ ("OpenCL::Context", ctx);
-}
+#END:device
 
 MODULE = OpenCL		PACKAGE = OpenCL::Context
 
@@ -262,88 +995,55 @@
         INFO (Context)
 
 void
-command_queue_simple (OpenCL::Context this, OpenCL::Device device)
+queue (OpenCL::Context this, OpenCL::Device device, cl_command_queue_properties properties = 0)
 	PPCODE:
-{
-	cl_int res;
-  	cl_command_queue queue = clCreateCommandQueue (this, device, 0, &res);
-
-        if (res)
-          FAIL (CreateCommandQueue, res);
-
+  	NEED_SUCCESS_ARG (cl_command_queue queue, CreateCommandQueue, (this, device, properties, &res));
         XPUSH_NEW_OBJ ("OpenCL::Queue", queue);
-}
 
 void
-buffer (OpenCL::Context this, cl_mem_flags flags, size_t len)
+user_event (OpenCL::Context this)
 	PPCODE:
-{
-	cl_int res;
-  	cl_mem mem;
+  	NEED_SUCCESS_ARG (cl_event ev, CreateUserEvent, (this, &res));
+        XPUSH_NEW_OBJ ("OpenCL::UserEvent", ev);
 
+void
+buffer (OpenCL::Context this, cl_mem_flags flags, size_t len)
+	PPCODE:
         if (flags & (CL_MEM_USE_HOST_PTR | CL_MEM_COPY_HOST_PTR))
           croak ("clCreateBuffer: cannot use/copy host ptr when no data is given, use $context->buffer_sv instead?");
         
-        mem = clCreateBuffer (this, flags, len, 0, &res);
-
-        if (res)
-          FAIL (CreateBuffer, res);
-
+        NEED_SUCCESS_ARG (cl_mem mem, CreateBuffer, (this, flags, len, 0, &res));
         XPUSH_NEW_OBJ ("OpenCL::Buffer", mem);
-}
 
 void
 buffer_sv (OpenCL::Context this, cl_mem_flags flags, SV *data)
 	PPCODE:
-{
 	STRLEN len;
         char *ptr = SvPVbyte (data, len);
-	cl_int res;
-  	cl_mem mem;
         
         if (!(flags & (CL_MEM_USE_HOST_PTR | CL_MEM_COPY_HOST_PTR)))
           croak ("clCreateBuffer: have to specify use or copy host ptr when buffer data is given, use $context->buffer instead?");
         
-        mem = clCreateBuffer (this, flags, len, ptr, &res);
-
-        if (res)
-          FAIL (CreateBuffer, res);
-
+        NEED_SUCCESS_ARG (cl_mem mem, CreateBuffer, (this, flags, len, ptr, &res));
         XPUSH_NEW_OBJ ("OpenCL::Buffer", mem);
-}
 
 void
-image2d (OpenCL::Context this, cl_mem_flags flags, cl_channel_order channel_order, cl_channel_type channel_type, size_t width, size_t height, SV *data)
+image2d (OpenCL::Context this, 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 = SvPVbyte (data, len);
         const cl_image_format format = { channel_order, channel_type };
-	cl_int res;
-  	cl_mem mem = clCreateImage2D (this, flags, &format, width, height, len / height, ptr, &res);
-
-        if (res)
-          FAIL (CreateImage2D, res);
-
+  	NEED_SUCCESS_ARG (cl_mem mem, CreateImage2D, (this, flags, &format, width, height, row_pitch, ptr, &res));
         XPUSH_NEW_OBJ ("OpenCL::Image2D", mem);
-}
 
 void
-image3d (OpenCL::Context this, 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 slice_pitch, SV *data)
+image3d (OpenCL::Context this, 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)
 	PPCODE:
-{
 	STRLEN len;
         char *ptr = SvPVbyte (data, len);
         const cl_image_format format = { channel_order, channel_type };
-	cl_int res;
-  	cl_mem mem = clCreateImage3D (this, flags, &format, width, height,
-                                      depth, len / (height * slice_pitch), slice_pitch, ptr, &res);
-
-        if (res)
-          FAIL (CreateImage3D, res);
-
+  	NEED_SUCCESS_ARG (cl_mem mem, CreateImage3D, (this, flags, &format, width, height, depth, row_pitch, slice_pitch, ptr, &res));
         XPUSH_NEW_OBJ ("OpenCL::Image3D", mem);
-}
 
 void
 supported_image_formats (OpenCL::Context this, cl_mem_flags flags, cl_mem_object_type image_type)
@@ -370,34 +1070,67 @@
 void
 sampler (OpenCL::Context this, cl_bool normalized_coords, cl_addressing_mode addressing_mode, cl_filter_mode filter_mode)
 	PPCODE:
-{
-	cl_int res;
-  	cl_sampler sampler = clCreateSampler (this, normalized_coords, addressing_mode, filter_mode, &res);
-
-        if (res)
-          FAIL (CreateSampler, res);
-
+  	NEED_SUCCESS_ARG (cl_sampler sampler, CreateSampler, (this, normalized_coords, addressing_mode, filter_mode, &res));
         XPUSH_NEW_OBJ ("OpenCL::Sampler", sampler);
-}
 
 void
 program_with_source (OpenCL::Context this, SV *program)
 	PPCODE:
-{
 	STRLEN len;
         size_t len2;
         const char *ptr = SvPVbyte (program, len);
-	cl_int res;
-  	cl_program prog;
         
         len2 = len;
-        prog = clCreateProgramWithSource (this, 1, &ptr, &len2, &res);
+  	NEED_SUCCESS_ARG (cl_program prog, CreateProgramWithSource, (this, 1, &ptr, &len2, &res));
+        XPUSH_NEW_OBJ ("OpenCL::Program", prog);
 
-        if (res)
-          FAIL (CreateProgramWithSource, res);
+#BEGIN:context
 
-        XPUSH_NEW_OBJ ("OpenCL::Program", prog);
-}
+void
+reference_count (OpenCL::Context this)
+ PPCODE:
+ cl_uint value [1];
+ NEED_SUCCESS (GetContextInfo, (this, CL_CONTEXT_REFERENCE_COUNT, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+devices (OpenCL::Context this)
+ PPCODE:
+ size_t size;
+ NEED_SUCCESS (GetContextInfo, (this, CL_CONTEXT_DEVICES,    0,     0, &size));
+ cl_device_id *value = tmpbuf (size);
+ NEED_SUCCESS (GetContextInfo, (this, CL_CONTEXT_DEVICES, size, value,     0));
+ int i, n = size / sizeof (*value);
+ EXTEND (SP, n);
+ for (i = 0; i < n; ++i)
+ {
+   PUSHs (NEW_MORTAL_OBJ ("OpenCL::Device", value [i]));
+ }
+
+void
+properties (OpenCL::Context this)
+ PPCODE:
+ size_t size;
+ NEED_SUCCESS (GetContextInfo, (this, CL_CONTEXT_PROPERTIES,    0,     0, &size));
+ cl_context_properties *value = tmpbuf (size);
+ NEED_SUCCESS (GetContextInfo, (this, CL_CONTEXT_PROPERTIES, size, value,     0));
+ int i, n = size / sizeof (*value);
+ EXTEND (SP, n);
+ for (i = 0; i < n; ++i)
+ PUSHs (sv_2mortal (newSVuv ((UV)value [i])));
+
+void
+num_devices (OpenCL::Context this)
+ PPCODE:
+ cl_uint value [1];
+ NEED_SUCCESS (GetContextInfo, (this, CL_CONTEXT_NUM_DEVICES, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+#END:context
 
 MODULE = OpenCL		PACKAGE = OpenCL::Queue
 
@@ -407,14 +1140,8 @@
         clReleaseCommandQueue (this);
 
 void
-info (OpenCL::Queue this, cl_command_queue_info name)
-	PPCODE:
-        INFO (CommandQueue)
-
-void
 enqueue_read_buffer (OpenCL::Queue this, OpenCL::Buffer mem, cl_bool blocking, size_t offset, size_t len, SV *data, ...)
 	PPCODE:
-{
 	cl_event ev = 0;
         EVENT_LIST (6, items - 6);
 
@@ -426,12 +1153,10 @@
 
         if (ev)
           XPUSH_NEW_OBJ ("OpenCL::Event", ev);
-}
 
 void
 enqueue_write_buffer (OpenCL::Queue this, OpenCL::Buffer mem, cl_bool blocking, size_t offset, SV *data, ...)
 	PPCODE:
-{
 	cl_event ev = 0;
 	STRLEN len;
         char *ptr = SvPVbyte (data, len);
@@ -441,12 +1166,10 @@
 
         if (ev)
           XPUSH_NEW_OBJ ("OpenCL::Event", ev);
-}
 
 void
 enqueue_copy_buffer (OpenCL::Queue this, OpenCL::Buffer src, OpenCL::Buffer dst, size_t src_offset, size_t dst_offset, size_t len, ...)
 	PPCODE:
-{
 	cl_event ev = 0;
         EVENT_LIST (6, items - 6);
 
@@ -454,20 +1177,22 @@
 
         if (ev)
           XPUSH_NEW_OBJ ("OpenCL::Event", ev);
-}
-
-  /*TODO http://www.khronos.org/registry/cl/sdk/1.1/docs/man/xhtml/clEnqueueReadBufferRect.html */
-  /*TODO http://www.khronos.org/registry/cl/sdk/1.1/docs/man/xhtml/clEnqueueWriteBufferRect.html */
 
 void
 enqueue_read_image (OpenCL::Queue this, OpenCL::Image src, cl_bool blocking, size_t src_x, size_t src_y, size_t src_z, size_t width, size_t height, size_t depth, size_t row_pitch, size_t slice_pitch, SV *data, ...)
 	PPCODE:
-{
 	cl_event ev = 0;
         const size_t src_origin[3] = { src_x, src_y, src_z };
         const size_t region[3] = { width, height, depth };
-        size_t len = row_pitch * slice_pitch * depth;
-        EVENT_LIST (11, items - 11);
+        EVENT_LIST (12, items - 12);
+
+	if (!row_pitch)
+	  row_pitch = img_row_pitch (src);
+
+        if (depth > 1 && !slice_pitch)
+          slice_pitch = row_pitch * height;
+
+        size_t len = slice_pitch ? slice_pitch * depth : row_pitch * height;
 
         SvUPGRADE (data, SVt_PV);
         SvGROW (data, len);
@@ -477,30 +1202,36 @@
 
         if (ev)
           XPUSH_NEW_OBJ ("OpenCL::Event", ev);
-}
 
 void
-enqueue_write_image (OpenCL::Queue this, OpenCL::Image dst, cl_bool blocking, size_t dst_x, size_t dst_y, size_t dst_z, size_t width, size_t height, size_t depth, size_t row_pitch, SV *data, ...)
+enqueue_write_image (OpenCL::Queue this, OpenCL::Image dst, cl_bool blocking, size_t dst_x, size_t dst_y, size_t dst_z, size_t width, size_t height, size_t depth, size_t row_pitch, size_t slice_pitch, SV *data, ...)
 	PPCODE:
-{
 	cl_event ev = 0;
         const size_t dst_origin[3] = { dst_x, dst_y, dst_z };
         const size_t region[3] = { width, height, depth };
 	STRLEN len;
         char *ptr = SvPVbyte (data, len);
-        size_t slice_pitch = len / (row_pitch * height);
-        EVENT_LIST (11, items - 11);
+        EVENT_LIST (12, items - 12);
+
+	if (!row_pitch)
+	  row_pitch = img_row_pitch (dst);
+
+        if (depth > 1 && !slice_pitch)
+          slice_pitch = row_pitch * height;
+
+        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, (this, dst, blocking, dst_origin, region, row_pitch, slice_pitch, SvPVX (data), event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0));
 
         if (ev)
           XPUSH_NEW_OBJ ("OpenCL::Event", ev);
-}
 
 void
 enqueue_copy_buffer_rect (OpenCL::Queue this, OpenCL::Buffer src, OpenCL::Buffer dst, size_t src_x, size_t src_y, size_t src_z, size_t dst_x, size_t dst_y, size_t dst_z, size_t width, size_t height, size_t depth, size_t src_row_pitch, size_t src_slice_pitch, size_t dst_row_pitch, size_t dst_slice_pitch, ...)
 	PPCODE:
-{
 	cl_event ev = 0;
         const size_t src_origin[3] = { src_x, src_y, src_z };
         const size_t dst_origin[3] = { dst_x, dst_y, dst_z };
@@ -511,12 +1242,10 @@
 
         if (ev)
           XPUSH_NEW_OBJ ("OpenCL::Event", ev);
-}
 
 void
 enqueue_copy_buffer_to_image (OpenCL::Queue this, OpenCL::Buffer src, OpenCL::Image dst, size_t src_offset, size_t dst_x, size_t dst_y, size_t dst_z, size_t width, size_t height, size_t depth, ...)
 	PPCODE:
-{
 	cl_event ev = 0;
         const size_t dst_origin[3] = { dst_x, dst_y, dst_z };
         const size_t region[3] = { width, height, depth };
@@ -526,12 +1255,10 @@
 
         if (ev)
           XPUSH_NEW_OBJ ("OpenCL::Event", ev);
-}
 
 void
-enqueue_copy_image (OpenCL::Queue this, OpenCL::Image src, OpenCL::Buffer dst, size_t src_x, size_t src_y, size_t src_z, size_t dst_x, size_t dst_y, size_t dst_z, size_t width, size_t height, size_t depth, ...)
+enqueue_copy_image (OpenCL::Queue this, OpenCL::Image src, OpenCL::Image dst, size_t src_x, size_t src_y, size_t src_z, size_t dst_x, size_t dst_y, size_t dst_z, size_t width, size_t height, size_t depth, ...)
 	PPCODE:
-{
 	cl_event ev = 0;
         const size_t src_origin[3] = { src_x, src_y, src_z };
         const size_t dst_origin[3] = { dst_x, dst_y, dst_z };
@@ -542,12 +1269,10 @@
 
         if (ev)
           XPUSH_NEW_OBJ ("OpenCL::Event", ev);
-}
 
 void
 enqueue_copy_image_to_buffer (OpenCL::Queue this, OpenCL::Image src, OpenCL::Buffer dst, size_t src_x, size_t src_y, size_t src_z, size_t width, size_t height, size_t depth, size_t dst_offset, ...)
 	PPCODE:
-{
 	cl_event ev = 0;
         const size_t src_origin[3] = { src_x, src_y, src_z };
         const size_t region[3] = { width, height, depth };
@@ -557,12 +1282,10 @@
 
         if (ev)
           XPUSH_NEW_OBJ ("OpenCL::Event", ev);
-}
 
 void
 enqueue_task (OpenCL::Queue this, OpenCL::Kernel kernel, ...)
 	PPCODE:
-{
 	cl_event ev = 0;
         EVENT_LIST (2, items - 2);
 
@@ -570,18 +1293,16 @@
 
         if (ev)
           XPUSH_NEW_OBJ ("OpenCL::Event", ev);
-}
 
 void
 enqueue_nd_range_kernel (OpenCL::Queue this, OpenCL::Kernel kernel, SV *global_work_offset, SV *global_work_size, SV *local_work_size = &PL_sv_undef, ...)
 	PPCODE:
-{
 	cl_event ev = 0;
         size_t *gwo = 0, *gws, *lws = 0;
         int gws_len;
         size_t *lists;
         int i;
-        EVENT_LIST (2, items - 2);
+        EVENT_LIST (5, items - 5);
 
         if (!SvROK (global_work_size) || SvTYPE (SvRV (global_work_size)) != SVt_PVAV)
           croak ("clEnqueueNDRangeKernel: global_work_size must be an array reference");
@@ -624,24 +1345,19 @@
 
         if (ev)
           XPUSH_NEW_OBJ ("OpenCL::Event", ev);
-}
 
 void
 enqueue_marker (OpenCL::Queue this)
 	PPCODE:
-{
 	cl_event ev;
         NEED_SUCCESS (EnqueueMarker, (this, &ev));
         XPUSH_NEW_OBJ ("OpenCL::Event", ev);
-}
 
 void
 enqueue_wait_for_events (OpenCL::Queue this, ...)
 	CODE:
-{
         EVENT_LIST (1, items - 1);
         NEED_SUCCESS (EnqueueWaitForEvents, (this, event_list_count, event_list_ptr));
-}
 
 void
 enqueue_barrier (OpenCL::Queue this)
@@ -658,6 +1374,56 @@
 	CODE:
         NEED_SUCCESS (Finish, (this));
 
+void
+info (OpenCL::Queue this, cl_command_queue_info name)
+	PPCODE:
+        INFO (CommandQueue)
+
+#BEGIN:command_queue
+
+void
+context (OpenCL::Queue this)
+ PPCODE:
+ cl_context value [1];
+ NEED_SUCCESS (GetCommandQueueInfo, (this, CL_QUEUE_CONTEXT, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ {
+   NEED_SUCCESS (RetainContext, (value [i]));
+   PUSHs (NEW_MORTAL_OBJ ("OpenCL::Context", value [i]));
+ }
+
+void
+device (OpenCL::Queue this)
+ PPCODE:
+ cl_device_id value [1];
+ NEED_SUCCESS (GetCommandQueueInfo, (this, CL_QUEUE_DEVICE, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ {
+   PUSHs (NEW_MORTAL_OBJ ("OpenCL::Device", value [i]));
+ }
+
+void
+reference_count (OpenCL::Queue this)
+ PPCODE:
+ cl_uint value [1];
+ NEED_SUCCESS (GetCommandQueueInfo, (this, CL_QUEUE_REFERENCE_COUNT, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+properties (OpenCL::Queue this)
+ PPCODE:
+ cl_command_queue_properties value [1];
+ NEED_SUCCESS (GetCommandQueueInfo, (this, CL_QUEUE_PROPERTIES, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSViv (value [i])));
+
+#END:command_queue
+
 MODULE = OpenCL		PACKAGE = OpenCL::Memory
 
 void
@@ -670,6 +1436,162 @@
 	PPCODE:
         INFO (MemObject)
 
+#BEGIN:mem
+
+void
+type (OpenCL::Memory this)
+ PPCODE:
+ cl_mem_object_type value [1];
+ NEED_SUCCESS (GetMemObjectInfo, (this, CL_MEM_TYPE, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSViv (value [i])));
+
+void
+flags (OpenCL::Memory this)
+ PPCODE:
+ cl_mem_flags value [1];
+ NEED_SUCCESS (GetMemObjectInfo, (this, CL_MEM_FLAGS, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSViv (value [i])));
+
+void
+size (OpenCL::Memory this)
+ PPCODE:
+ size_t value [1];
+ NEED_SUCCESS (GetMemObjectInfo, (this, CL_MEM_SIZE, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+host_ptr (OpenCL::Memory this)
+ PPCODE:
+ void * value [1];
+ NEED_SUCCESS (GetMemObjectInfo, (this, CL_MEM_HOST_PTR, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv ((IV)(intptr_t)value [i])));
+
+void
+map_count (OpenCL::Memory this)
+ PPCODE:
+ cl_uint value [1];
+ NEED_SUCCESS (GetMemObjectInfo, (this, CL_MEM_MAP_COUNT, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+reference_count (OpenCL::Memory this)
+ PPCODE:
+ cl_uint value [1];
+ NEED_SUCCESS (GetMemObjectInfo, (this, CL_MEM_REFERENCE_COUNT, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+context (OpenCL::Memory this)
+ PPCODE:
+ cl_context value [1];
+ NEED_SUCCESS (GetMemObjectInfo, (this, CL_MEM_CONTEXT, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ {
+   NEED_SUCCESS (RetainContext, (value [i]));
+   PUSHs (NEW_MORTAL_OBJ ("OpenCL::Context", value [i]));
+ }
+
+void
+associated_memobject (OpenCL::Memory this)
+ PPCODE:
+ cl_mem value [1];
+ NEED_SUCCESS (GetMemObjectInfo, (this, CL_MEM_ASSOCIATED_MEMOBJECT, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ {
+   NEED_SUCCESS (RetainMemObject, (value [i]));
+   PUSHs (NEW_MORTAL_OBJ ("OpenCL::Memory", value [i]));
+ }
+
+void
+offset (OpenCL::Memory this)
+ PPCODE:
+ size_t value [1];
+ NEED_SUCCESS (GetMemObjectInfo, (this, CL_MEM_OFFSET, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+#END:mem
+
+MODULE = OpenCL		PACKAGE = OpenCL::Image
+
+void
+image_info (OpenCL::Image this, cl_image_info name)
+	PPCODE:
+        INFO (Image)
+
+#BEGIN:image
+
+void
+element_size (OpenCL::Image this)
+ PPCODE:
+ size_t value [1];
+ NEED_SUCCESS (GetImageInfo, (this, CL_IMAGE_ELEMENT_SIZE, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+row_pitch (OpenCL::Image this)
+ PPCODE:
+ size_t value [1];
+ NEED_SUCCESS (GetImageInfo, (this, CL_IMAGE_ROW_PITCH, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+slice_pitch (OpenCL::Image this)
+ PPCODE:
+ size_t value [1];
+ NEED_SUCCESS (GetImageInfo, (this, CL_IMAGE_SLICE_PITCH, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+width (OpenCL::Image this)
+ PPCODE:
+ size_t value [1];
+ NEED_SUCCESS (GetImageInfo, (this, CL_IMAGE_WIDTH, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+height (OpenCL::Image this)
+ PPCODE:
+ size_t value [1];
+ NEED_SUCCESS (GetImageInfo, (this, CL_IMAGE_HEIGHT, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+depth (OpenCL::Image this)
+ PPCODE:
+ size_t value [1];
+ NEED_SUCCESS (GetImageInfo, (this, CL_IMAGE_DEPTH, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+#END:image
+
 MODULE = OpenCL		PACKAGE = OpenCL::Sampler
 
 void
@@ -682,6 +1604,58 @@
 	PPCODE:
         INFO (Sampler)
 
+#BEGIN:sampler
+
+void
+reference_count (OpenCL::Sampler this)
+ PPCODE:
+ cl_uint value [1];
+ NEED_SUCCESS (GetSamplerInfo, (this, CL_SAMPLER_REFERENCE_COUNT, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+context (OpenCL::Sampler this)
+ PPCODE:
+ cl_context value [1];
+ NEED_SUCCESS (GetSamplerInfo, (this, CL_SAMPLER_CONTEXT, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ {
+   NEED_SUCCESS (RetainContext, (value [i]));
+   PUSHs (NEW_MORTAL_OBJ ("OpenCL::Context", value [i]));
+ }
+
+void
+normalized_coords (OpenCL::Sampler this)
+ PPCODE:
+ cl_addressing_mode value [1];
+ NEED_SUCCESS (GetSamplerInfo, (this, CL_SAMPLER_NORMALIZED_COORDS, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSViv (value [i])));
+
+void
+addressing_mode (OpenCL::Sampler this)
+ PPCODE:
+ cl_filter_mode value [1];
+ NEED_SUCCESS (GetSamplerInfo, (this, CL_SAMPLER_ADDRESSING_MODE, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSViv (value [i])));
+
+void
+filter_mode (OpenCL::Sampler this)
+ PPCODE:
+ cl_bool value [1];
+ NEED_SUCCESS (GetSamplerInfo, (this, CL_SAMPLER_FILTER_MODE, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (value [i] ? &PL_sv_yes : &PL_sv_no));
+
+#END:sampler
+
 MODULE = OpenCL		PACKAGE = OpenCL::Program
 
 void
@@ -690,11 +1664,6 @@
         clReleaseProgram (this);
 
 void
-info (OpenCL::Program this, cl_program_info name)
-	PPCODE:
-        INFO (Program)
-
-void
 build (OpenCL::Program this, OpenCL::Device device, SV *options = &PL_sv_undef)
 	CODE:
         NEED_SUCCESS (BuildProgram, (this, 1, &device, SvPVbyte_nolen (options), 0, 0));
@@ -702,31 +1671,162 @@
 void
 build_info (OpenCL::Program this, OpenCL::Device device, cl_program_build_info name)
 	PPCODE:
-{
   	size_t size;
-        SV *sv;
- 
   	NEED_SUCCESS (GetProgramBuildInfo, (this, device, name, 0, 0, &size));
-        sv = sv_2mortal (newSV (size));
+        SV *sv = sv_2mortal (newSV (size));
         SvUPGRADE (sv, SVt_PV);
         SvPOK_only (sv);
         SvCUR_set (sv, size);
   	NEED_SUCCESS (GetProgramBuildInfo, (this, device, name, size, SvPVX (sv), 0));
         XPUSHs (sv);
-}
+
+#BEGIN:program_build
+
+void
+build_status (OpenCL::Program this, OpenCL::Device device)
+ PPCODE:
+ cl_build_status value [1];
+ NEED_SUCCESS (GetProgramBuildInfo, (this, device, CL_PROGRAM_BUILD_STATUS, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSViv (value [i])));
+
+void
+build_options (OpenCL::Program this, OpenCL::Device device)
+ PPCODE:
+ size_t size;
+ NEED_SUCCESS (GetProgramBuildInfo, (this, device, CL_PROGRAM_BUILD_OPTIONS,    0,     0, &size));
+ char *value = tmpbuf (size);
+ NEED_SUCCESS (GetProgramBuildInfo, (this, device, CL_PROGRAM_BUILD_OPTIONS, size, value,     0));
+ int i, n = 1;
+ EXTEND (SP, n);
+ for (i = 0; i < n; ++i)
+ PUSHs (sv_2mortal (newSVpv (value, 0)));
+
+void
+build_log (OpenCL::Program this, OpenCL::Device device)
+ PPCODE:
+ size_t size;
+ NEED_SUCCESS (GetProgramBuildInfo, (this, device, CL_PROGRAM_BUILD_LOG,    0,     0, &size));
+ char *value = tmpbuf (size);
+ NEED_SUCCESS (GetProgramBuildInfo, (this, device, CL_PROGRAM_BUILD_LOG, size, value,     0));
+ int i, n = 1;
+ EXTEND (SP, n);
+ for (i = 0; i < n; ++i)
+ PUSHs (sv_2mortal (newSVpv (value, 0)));
+
+#END:program_build
 
 void
 kernel (OpenCL::Program program, SV *function)
 	PPCODE:
-{
-	cl_int res;
-  	cl_kernel kernel = clCreateKernel (program, SvPVbyte_nolen (function), &res);
+  	NEED_SUCCESS_ARG (cl_kernel kernel, CreateKernel, (program, SvPVbyte_nolen (function), &res));
+        XPUSH_NEW_OBJ ("OpenCL::Kernel", kernel);
 
-        if (res)
-          FAIL (CreateKernel, res);
+void
+info (OpenCL::Program this, cl_program_info name)
+	PPCODE:
+        INFO (Program)
 
-        XPUSH_NEW_OBJ ("OpenCL::Kernel", kernel);
-}
+void
+binaries (OpenCL::Program this)
+	PPCODE:
+        cl_uint n, i;
+        size_t size;
+
+        NEED_SUCCESS (GetProgramInfo, (this, CL_PROGRAM_NUM_DEVICES , sizeof (n)          , &n   , 0));
+        if (!n) XSRETURN_EMPTY;
+
+        size_t *sizes = tmpbuf (sizeof (*sizes) * n);
+        NEED_SUCCESS (GetProgramInfo, (this, CL_PROGRAM_BINARY_SIZES, sizeof (*sizes) * n, sizes, &size));
+        if (size != sizeof (*sizes) * n) XSRETURN_EMPTY;
+        unsigned char **ptrs = tmpbuf (sizeof (*ptrs) * n);
+
+        EXTEND (SP, n);
+        for (i = 0; i < n; ++i)
+          {
+            SV *sv = sv_2mortal (newSV (sizes [i]));
+            SvUPGRADE (sv, SVt_PV);
+            SvPOK_only (sv);
+            SvCUR_set (sv, sizes [i]);
+            ptrs [i] = SvPVX (sv);
+            PUSHs (sv);
+          }
+
+        NEED_SUCCESS (GetProgramInfo, (this, CL_PROGRAM_BINARIES    , sizeof (*ptrs ) * n, ptrs , &size));
+        if (size != sizeof (*ptrs) * n) XSRETURN_EMPTY;
+
+#BEGIN:program
+
+void
+reference_count (OpenCL::Program this)
+ PPCODE:
+ cl_uint value [1];
+ NEED_SUCCESS (GetProgramInfo, (this, CL_PROGRAM_REFERENCE_COUNT, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+context (OpenCL::Program this)
+ PPCODE:
+ cl_context value [1];
+ NEED_SUCCESS (GetProgramInfo, (this, CL_PROGRAM_CONTEXT, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ {
+   NEED_SUCCESS (RetainContext, (value [i]));
+   PUSHs (NEW_MORTAL_OBJ ("OpenCL::Context", value [i]));
+ }
+
+void
+num_devices (OpenCL::Program this)
+ PPCODE:
+ cl_uint value [1];
+ NEED_SUCCESS (GetProgramInfo, (this, CL_PROGRAM_NUM_DEVICES, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+devices (OpenCL::Program this)
+ PPCODE:
+ size_t size;
+ NEED_SUCCESS (GetProgramInfo, (this, CL_PROGRAM_DEVICES,    0,     0, &size));
+ cl_device_id *value = tmpbuf (size);
+ NEED_SUCCESS (GetProgramInfo, (this, CL_PROGRAM_DEVICES, size, value,     0));
+ int i, n = size / sizeof (*value);
+ EXTEND (SP, n);
+ for (i = 0; i < n; ++i)
+ {
+   PUSHs (NEW_MORTAL_OBJ ("OpenCL::Device", value [i]));
+ }
+
+void
+source (OpenCL::Program this)
+ PPCODE:
+ size_t size;
+ NEED_SUCCESS (GetProgramInfo, (this, CL_PROGRAM_SOURCE,    0,     0, &size));
+ char *value = tmpbuf (size);
+ NEED_SUCCESS (GetProgramInfo, (this, CL_PROGRAM_SOURCE, size, value,     0));
+ int i, n = 1;
+ EXTEND (SP, n);
+ for (i = 0; i < n; ++i)
+ PUSHs (sv_2mortal (newSVpv (value, 0)));
+
+void
+binary_sizes (OpenCL::Program this)
+ PPCODE:
+ size_t size;
+ NEED_SUCCESS (GetProgramInfo, (this, CL_PROGRAM_BINARY_SIZES,    0,     0, &size));
+ size_t *value = tmpbuf (size);
+ NEED_SUCCESS (GetProgramInfo, (this, CL_PROGRAM_BINARY_SIZES, size, value,     0));
+ int i, n = size / sizeof (*value);
+ EXTEND (SP, n);
+ for (i = 0; i < n; ++i)
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+#END:program
 
 MODULE = OpenCL		PACKAGE = OpenCL::Kernel
 
@@ -736,11 +1836,6 @@
         clReleaseKernel (this);
 
 void
-info (OpenCL::Kernel this, cl_kernel_info name)
-	PPCODE:
-        INFO (Kernel)
-
-void
 set_char (OpenCL::Kernel this, cl_uint idx, cl_char value)
 	CODE:
         clSetKernelArg (this, idx, sizeof (value), &value);
@@ -791,6 +1886,11 @@
         clSetKernelArg (this, idx, sizeof (value), &value);
 
 void
+set_double (OpenCL::Kernel this, cl_uint idx, cl_double value)
+	CODE:
+        clSetKernelArg (this, idx, sizeof (value), &value);
+
+void
 set_memory (OpenCL::Kernel this, cl_uint idx, OpenCL::Memory_ornull value)
 	CODE:
         clSetKernelArg (this, idx, sizeof (value), &value);
@@ -820,6 +1920,133 @@
 	CODE:
         clSetKernelArg (this, idx, sizeof (value), &value);
 
+void
+info (OpenCL::Kernel this, cl_kernel_info name)
+	PPCODE:
+        INFO (Kernel)
+
+#BEGIN:kernel
+
+void
+function_name (OpenCL::Kernel this)
+ PPCODE:
+ size_t size;
+ NEED_SUCCESS (GetKernelInfo, (this, CL_KERNEL_FUNCTION_NAME,    0,     0, &size));
+ char *value = tmpbuf (size);
+ NEED_SUCCESS (GetKernelInfo, (this, CL_KERNEL_FUNCTION_NAME, size, value,     0));
+ int i, n = 1;
+ EXTEND (SP, n);
+ for (i = 0; i < n; ++i)
+ PUSHs (sv_2mortal (newSVpv (value, 0)));
+
+void
+num_args (OpenCL::Kernel this)
+ PPCODE:
+ cl_uint value [1];
+ NEED_SUCCESS (GetKernelInfo, (this, CL_KERNEL_NUM_ARGS, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+reference_count (OpenCL::Kernel this)
+ PPCODE:
+ cl_uint value [1];
+ NEED_SUCCESS (GetKernelInfo, (this, CL_KERNEL_REFERENCE_COUNT, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+context (OpenCL::Kernel this)
+ PPCODE:
+ cl_context value [1];
+ NEED_SUCCESS (GetKernelInfo, (this, CL_KERNEL_CONTEXT, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ {
+   NEED_SUCCESS (RetainContext, (value [i]));
+   PUSHs (NEW_MORTAL_OBJ ("OpenCL::Context", value [i]));
+ }
+
+void
+program (OpenCL::Kernel this)
+ PPCODE:
+ cl_program value [1];
+ NEED_SUCCESS (GetKernelInfo, (this, CL_KERNEL_PROGRAM, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ {
+   NEED_SUCCESS (RetainProgram, (value [i]));
+   PUSHs (NEW_MORTAL_OBJ ("OpenCL::Program", value [i]));
+ }
+
+#END:kernel
+
+void
+work_group_info (OpenCL::Kernel this, OpenCL::Device device, cl_kernel_work_group_info name)
+	PPCODE:
+  	size_t size;
+  	NEED_SUCCESS (GetKernelWorkGroupInfo, (this, device, name, 0, 0, &size));
+        SV *sv = sv_2mortal (newSV (size));
+        SvUPGRADE (sv, SVt_PV);
+        SvPOK_only (sv);
+        SvCUR_set (sv, size);
+  	NEED_SUCCESS (GetKernelWorkGroupInfo, (this, device, name, size, SvPVX (sv), 0));
+        XPUSHs (sv);
+
+#BEGIN:kernel_work_group
+
+void
+work_group_size (OpenCL::Kernel this, OpenCL::Device device)
+ PPCODE:
+ size_t value [1];
+ NEED_SUCCESS (GetKernelWorkGroupInfo, (this, device, CL_KERNEL_WORK_GROUP_SIZE, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+compile_work_group_size (OpenCL::Kernel this, OpenCL::Device device)
+ PPCODE:
+ size_t size;
+ NEED_SUCCESS (GetKernelWorkGroupInfo, (this, device, CL_KERNEL_COMPILE_WORK_GROUP_SIZE,    0,     0, &size));
+ size_t *value = tmpbuf (size);
+ NEED_SUCCESS (GetKernelWorkGroupInfo, (this, device, CL_KERNEL_COMPILE_WORK_GROUP_SIZE, size, value,     0));
+ int i, n = size / sizeof (*value);
+ EXTEND (SP, n);
+ for (i = 0; i < n; ++i)
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+local_mem_size (OpenCL::Kernel this, OpenCL::Device device)
+ PPCODE:
+ cl_ulong value [1];
+ NEED_SUCCESS (GetKernelWorkGroupInfo, (this, device, CL_KERNEL_LOCAL_MEM_SIZE, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+preferred_work_group_size_multiple (OpenCL::Kernel this, OpenCL::Device device)
+ PPCODE:
+ size_t value [1];
+ NEED_SUCCESS (GetKernelWorkGroupInfo, (this, device, CL_KERNEL_PREFERRED_WORK_GROUP_SIZE_MULTIPLE, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+private_mem_size (OpenCL::Kernel this, OpenCL::Device device)
+ PPCODE:
+ cl_ulong value [1];
+ NEED_SUCCESS (GetKernelWorkGroupInfo, (this, device, CL_KERNEL_PRIVATE_MEM_SIZE, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+#END:kernel_work_group
+
 MODULE = OpenCL		PACKAGE = OpenCL::Event
 
 void
@@ -828,12 +2055,119 @@
         clReleaseEvent (this);
 
 void
+wait (OpenCL::Event this)
+	CODE:
+	clWaitForEvents (1, &this);
+
+void
 info (OpenCL::Event this, cl_event_info name)
 	PPCODE:
         INFO (Event)
 
+#BEGIN:event
+
 void
-wait (OpenCL::Event this)
+command_queue (OpenCL::Event this)
+ PPCODE:
+ cl_command_queue value [1];
+ NEED_SUCCESS (GetEventInfo, (this, CL_EVENT_COMMAND_QUEUE, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ {
+   NEED_SUCCESS (RetainCommandQueue, (value [i]));
+   PUSHs (NEW_MORTAL_OBJ ("OpenCL::Queue", value [i]));
+ }
+
+void
+command_type (OpenCL::Event this)
+ PPCODE:
+ cl_command_type value [1];
+ NEED_SUCCESS (GetEventInfo, (this, CL_EVENT_COMMAND_TYPE, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+reference_count (OpenCL::Event this)
+ PPCODE:
+ cl_uint value [1];
+ NEED_SUCCESS (GetEventInfo, (this, CL_EVENT_REFERENCE_COUNT, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+command_execution_status (OpenCL::Event this)
+ PPCODE:
+ cl_uint value [1];
+ NEED_SUCCESS (GetEventInfo, (this, CL_EVENT_COMMAND_EXECUTION_STATUS, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+context (OpenCL::Event this)
+ PPCODE:
+ cl_context value [1];
+ NEED_SUCCESS (GetEventInfo, (this, CL_EVENT_CONTEXT, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ {
+   NEED_SUCCESS (RetainContext, (value [i]));
+   PUSHs (NEW_MORTAL_OBJ ("OpenCL::Context", value [i]));
+ }
+
+#END:event
+
+void
+profiling_info (OpenCL::Event this, cl_profiling_info name)
+	PPCODE:
+        INFO (EventProfiling)
+
+#BEGIN:profiling
+
+void
+profiling_command_queued (OpenCL::Event this)
+ PPCODE:
+ cl_ulong value [1];
+ NEED_SUCCESS (GetEventProfilingInfo, (this, CL_PROFILING_COMMAND_QUEUED, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+profiling_command_submit (OpenCL::Event this)
+ PPCODE:
+ cl_ulong value [1];
+ NEED_SUCCESS (GetEventProfilingInfo, (this, CL_PROFILING_COMMAND_SUBMIT, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+profiling_command_start (OpenCL::Event this)
+ PPCODE:
+ cl_ulong value [1];
+ NEED_SUCCESS (GetEventProfilingInfo, (this, CL_PROFILING_COMMAND_START, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+void
+profiling_command_end (OpenCL::Event this)
+ PPCODE:
+ cl_ulong value [1];
+ NEED_SUCCESS (GetEventProfilingInfo, (this, CL_PROFILING_COMMAND_END, sizeof (value), value, 0));
+ EXTEND (SP, 1);
+ const int i = 0;
+ PUSHs (sv_2mortal (newSVuv (value [i])));
+
+#END:profiling
+
+MODULE = OpenCL		PACKAGE = OpenCL::UserEvent
+
+void
+set_status (OpenCL::UserEvent this, cl_int execution_status)
 	CODE:
-	clWaitForEvents (1, &this);
+	clSetUserEventStatus (this, execution_status);