[javacl-generator] added support for image2d_t and image3d_t

twitwi · twitwi · commit cc26fd41bde3 · 2012-04-23T23:18:27.000+02:00
NB: unfortunately, I did not add any formal tests (but have been using it in the SobelFilterDemo, see next commit)

I (Rémi Emonet) fully transfer the copyright for this commit to the nativelibs4java/jnaerator project, without any licensing restrictions.
Signed-off-by: Remi Emonet &lt;remi.emonet@reverse--com.heeere&gt;
diff --git a/Generator/src/main/java/com/nativelibs4java/opencl/generator/JavaCLGenerator.java b/Generator/src/main/java/com/nativelibs4java/opencl/generator/JavaCLGenerator.java
@@ -317,6 +317,16 @@ static class Conversion {
                 }
             }
         }
+        data = new Object[] {
+            "image2d_t", CLImage2D.class,
+            "image3d_t", CLImage3D.class
+        };
+        for (int i = 0; i < data.length; i+=2) {
+            String type = (String) data[i];
+            Class<?> scalClass = (Class<?>)data[i + 1];
+            Pair<Integer, Class<?>> arrPair = new Pair<Integer, Class<?>>(1, scalClass);
+            arraysAndArityByType.put(type, arrPair);
+        }
     }
     private Conversion convertTypeToJavaCL(Result result, String argName, TypeRef valueType, TypeConversionMode typeConversionMode, Identifier libraryClassName) throws UnsupportedConversionException {
         Conversion ret = new Conversion();

Original file line number	Diff line number	Diff line change
`@@ -317,6 +317,16 @@ static class Conversion {`
`317`	`317`	`}`
`318`	`318`	`}`
`319`	`319`	`}`
	`320`	`+ data = new Object[] {`
	`321`	`+ "image2d_t", CLImage2D.class,`
	`322`	`+ "image3d_t", CLImage3D.class`
	`323`	`+ };`
	`324`	`+ for (int i = 0; i < data.length; i+=2) {`
	`325`	`+ String type = (String) data[i];`
	`326`	`+ Class<?> scalClass = (Class<?>)data[i + 1];`
	`327`	`+ Pair<Integer, Class<?>> arrPair = new Pair<Integer, Class<?>>(1, scalClass);`
	`328`	`+ arraysAndArityByType.put(type, arrPair);`
	`329`	`+ }`
`320`	`330`	`}`
`321`	`331`	`private Conversion convertTypeToJavaCL(Result result, String argName, TypeRef valueType, TypeConversionMode typeConversionMode, Identifier libraryClassName) throws UnsupportedConversionException {`
`322`	`332`	`Conversion ret = new Conversion();`