--- OpenCL/typemap	2012/04/24 22:45:38	1.11
+++ OpenCL/typemap	2012/05/04 14:49:42	1.15
@@ -11,36 +11,38 @@
 cl_float		T_NV
 cl_half			T_UV
 
-cl_bitfield		T_UV
-cl_device_fp_config	T_UV
-cl_device_exec_capabilities T_UV
-
-cl_platform_info	T_IV
-cl_device_type		T_IV
-cl_device_info		T_IV
-cl_device_mem_cache_type T_UV
-cl_device_local_mem_type T_UV
+cl_bitfield			T_UV
+cl_device_fp_config		T_UV
+cl_device_exec_capabilities	T_UV
+cl_platform_info		T_UV
+cl_device_type			T_UV
+cl_device_info			T_UV
+cl_device_mem_cache_type	T_UV
+cl_device_local_mem_type	T_UV
 cl_device_partition_property_ext T_UV
-cl_context_info		T_IV
-cl_command_queue_properties T_IV
-cl_command_queue_info	T_IV
-cl_mem_flags		T_IV
-cl_mem_info		T_IV
-cl_mem_object_type	T_IV
-cl_image_info		T_IV
-cl_profiling_info	T_IV
-cl_channel_order	T_UV
-cl_channel_type		T_UV
-cl_event_info		T_IV
-cl_addressing_mode	T_IV
-cl_filter_mode		T_IV
-cl_sampler_info		T_IV
-cl_program_info		T_IV
-cl_program_build_info	T_IV
-cl_build_status		T_IV
-cl_kernel_info		T_IV
-cl_kernel_work_group_info T_IV
-cl_command_type		T_UV
+cl_context_info			T_UV
+cl_command_queue_properties	T_UV
+cl_command_queue_info		T_UV
+cl_mem_flags			T_UV
+cl_mem_info			T_UV
+cl_mem_object_type		T_UV
+cl_map_flags			T_UV
+cl_image_info			T_UV
+cl_profiling_info		T_UV
+cl_channel_order		T_UV
+cl_channel_type			T_UV
+cl_event_info			T_UV
+cl_addressing_mode		T_UV
+cl_filter_mode			T_UV
+cl_sampler_info			T_UV
+cl_program_info			T_UV
+cl_program_build_info		T_UV
+cl_build_status			T_IV
+cl_kernel_info			T_UV
+cl_kernel_work_group_info	T_UV
+cl_kernel_arg_info		T_UV
+cl_command_type			T_UV
+cl_mem_migration_flags		T_UV
 
 cl_context_properties * context_properties
 
@@ -53,26 +55,25 @@
 cl_gl_platform_info	T_UV
 cl_gl_context_info	T_UV
 
-OpenCL::Platform	clobj
+OpenCL::Platform	clobj_ni
 OpenCL::Device		clobj
-OpenCL::Context		clobj
-OpenCL::Queue		clobj
+OpenCL::SubDevice	clobj_ni
+OpenCL::Context		clobj_ni
+OpenCL::Queue		clobj_ni
 OpenCL::Memory		clobj
 OpenCL::Buffer		clobj
-OpenCL::BufferObj	clobj
+OpenCL::BufferObj	clobj_ni
 OpenCL::Image		clobj
-OpenCL::Image2D		clobj
-OpenCL::Image3D		clobj
 OpenCL::Memory_ornull	clobj_ornull
 OpenCL::Buffer_ornull	clobj_ornull
 OpenCL::Image_ornull	clobj_ornull
-OpenCL::Image2D_ornull	clobj_ornull
-OpenCL::Image3D_ornull	clobj_ornull
-OpenCL::Sampler		clobj
-OpenCL::Program		clobj
-OpenCL::Kernel		clobj
+OpenCL::Sampler		clobj_ni
+OpenCL::Program		clobj_ni
+OpenCL::Kernel		clobj_ni
 OpenCL::Event		clobj
-OpenCL::UserEvent	clobj
+OpenCL::UserEvent	clobj_ni
+
+OpenCL::Mapped		mapped
 
 FUTURE			future
 
@@ -88,6 +89,12 @@
 clobj
 	$var = ($type)SvCLOBJ (${$ALIAS?\q[GvNAME(CvGV(cv))]:\qq[\"$pname\"]}, \"$var\", $arg, \"${ntype}\")
 
+clobj_ni
+	$var = ($type)SvCLOBJ_ni (${$ALIAS?\q[GvNAME(CvGV(cv))]:\qq[\"$pname\"]}, \"$var\", $arg, stash_${(my $x = $ntype) =~ s/OpenCL:://; \lc $x})
+
 clobj_ornull
 	$var = SvOK ($arg) ? ($type)SvCLOBJ (${$ALIAS?\q[GvNAME(CvGV(cv))]:\qq[\"$pname\"]}, \"$var\", $arg, \"${\substr $ntype, 0, -7}\") : 0
 
+mapped
+	$var = SvMAPPED ($arg);
+