diff options
author | Michael Bien <[email protected]> | 2010-09-07 21:26:53 +0200 |
---|---|---|
committer | Michael Bien <[email protected]> | 2010-09-07 21:26:53 +0200 |
commit | 84edfc7970a0bc828ba38295d88ee6e2a4dabbce (patch) | |
tree | 32db98d8458403e8ee5d6c579852bf626d3ea3a9 /src/com/jogamp/opencl/CLVersion.java | |
parent | bc4e1521cc2ccc91a033998847dc35e1a8c8687b (diff) |
added com.jogamp.util.CLInfo.
introduced CLProperty annotation for CLDevice and CLPlatform properties.
fixed bug in CLVersion.
Diffstat (limited to 'src/com/jogamp/opencl/CLVersion.java')
-rw-r--r-- | src/com/jogamp/opencl/CLVersion.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/jogamp/opencl/CLVersion.java b/src/com/jogamp/opencl/CLVersion.java index e8a7e79c..82ee6466 100644 --- a/src/com/jogamp/opencl/CLVersion.java +++ b/src/com/jogamp/opencl/CLVersion.java @@ -13,7 +13,7 @@ import java.util.regex.Pattern; */ public class CLVersion implements Comparable<CLVersion> { - private final static Pattern pattern = Pattern.compile("OpenCL (\\d+)\\.(\\d+)(.*)"); + private final static Pattern pattern = Pattern.compile("OpenCL (?:C )?(\\d+)\\.(\\d+)(.*)"); public final static CLVersion CL_1_0 = new CLVersion("OpenCL 1.0"); public final static CLVersion CL_1_1 = new CLVersion("OpenCL 1.1"); @@ -134,7 +134,7 @@ public class CLVersion implements Comparable<CLVersion> { */ @Override public boolean equals(Object obj) { - return obj != null && fullversion.equals(obj); + return obj != null && obj.getClass() == getClass() && fullversion.equals(((CLVersion)obj).fullversion); } |