Fix CL image arguments

loopy/kernel/data.py

@@ -244,7 +244,7 @@ class ImageArg(ArrayBase, KernelArgument):
 
     def get_arg_decl(self, target, name_suffix, shape, dtype, is_written):
         return target.get_image_arg_decl(self.name + name_suffix, shape,
-                dtype, is_written)
+                self.num_target_axes(), dtype, is_written)
 
 
 class ValueArg(KernelArgument):

loopy/target/__init__.py

@@ -119,7 +119,7 @@ class TargetBase(object):
     def get_global_arg_decl(self, name, shape, dtype, is_written):
         raise NotImplementedError()
 
-    def get_image_arg_decl(self, name, shape, dtype, is_written):
+    def get_image_arg_decl(self, name, shape, num_target_axes, dtype, is_written):
         raise NotImplementedError()
 
     # }}}

loopy/target/opencl.py

@@ -309,14 +309,14 @@ class OpenCLTarget(CTarget):
         return CLGlobal(super(OpenCLTarget, self).get_global_arg_decl(
             name, shape, dtype, is_written))
 
-    def get_image_arg_decl(self, name, shape, dtype, is_written):
+    def get_image_arg_decl(self, name, shape, num_target_axes, dtype, is_written):
         if is_written:
             mode = "w"
         else:
             mode = "r"
 
         from cgen.opencl import CLImage
-        return CLImage(self.num_target_axes(), mode, name)
+        return CLImage(num_target_axes, mode, name)
 
     def get_constant_arg_decl(self, name, shape, dtype, is_written):
         from loopy.codegen import POD  # uses the correct complex type