--- OpenCL/typemap	2012/05/01 16:37:23	1.12
+++ OpenCL/typemap	2012/05/03 23:30:08	1.13
@@ -53,26 +53,24 @@
 cl_gl_platform_info	T_UV
 cl_gl_context_info	T_UV
 
-OpenCL::Platform	clobj
-OpenCL::Device		clobj
-OpenCL::Context		clobj
-OpenCL::Queue		clobj
+OpenCL::Platform	clobj_ni
+OpenCL::Device		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
 
@@ -90,6 +88,9 @@
 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