improved CLProgramBuilder and implemented propper configuration loading.

1 files changed, 21 insertions, 3 deletions

diff --git a/src/com/mbien/opencl/CLBuildConfiguration.java b/src/com/mbien/opencl/CLBuildConfiguration.java
index 86b5cfa2..eee641a0 100644
--- a/src/com/mbien/opencl/CLBuildConfiguration.java
+++ b/src/com/mbien/opencl/CLBuildConfiguration.java
@@ -1,13 +1,14 @@
 package com.mbien.opencl;
 
 import java.io.IOException;
-import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.util.Map;
 
 /**
  * Configuration representing everything needed to build an OpenCL program.
  * @author Michael Bien
+ * @see CLProgramBuilder#createConfiguration()
+ * @see CLProgramBuilder#loadConfiguration(java.io.ObjectInputStream)
  */
 public interface CLBuildConfiguration extends Cloneable {
 
@@ -38,6 +39,21 @@ public interface CLBuildConfiguration extends Cloneable {
     public CLBuildConfiguration reset();
 
     /**
+     * Resets this builder's configuration options.
+     */
+    public CLBuildConfiguration resetOptions();
+
+    /**
+     * Resets this builder's macro definitions.
+     */
+    public CLBuildConfiguration resetDefines();
+
+    /**
+     * Resets this builder's device list.
+     */
+    public CLBuildConfiguration resetDevices();
+
+    /**
      * Adds the definition to the build configuration.
      * @see CLProgram#define(java.lang.String)
      */
@@ -78,8 +94,10 @@ public interface CLBuildConfiguration extends Cloneable {
      */
     public CLBuildConfiguration clone();
 
+    /**
+     * Saves this configuration to the ObjectOutputStream.
+     * The caller is responsible for closing the stream.
+     */
     public void save(ObjectOutputStream oos) throws IOException;
 
-    public CLBuildConfiguration load(ObjectInputStream ois)  throws IOException, ClassNotFoundException;
-
 }