From 00f4325c5a46bf7c46be8646c1eb6f53b632f30a Mon Sep 17 00:00:00 2001
From: Wade Walker <wwalker3@austin.rr.com>
Date: Sun, 6 Apr 2014 14:20:19 -0500
Subject: Finish texture sharing test.

Make the test modify a GL texture with a CL kernel, then loop over the
texture afterwards to check each texel has the right value. Also make
the test loop over all platforms and devices that support sharing.
---
 src/com/jogamp/opencl/util/CLDeviceFilters.java   |  2 +-
 src/com/jogamp/opencl/util/CLPlatformFilters.java | 18 +++++++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

(limited to 'src/com/jogamp')

diff --git a/src/com/jogamp/opencl/util/CLDeviceFilters.java b/src/com/jogamp/opencl/util/CLDeviceFilters.java
index a5057fb6..6281b844 100644
--- a/src/com/jogamp/opencl/util/CLDeviceFilters.java
+++ b/src/com/jogamp/opencl/util/CLDeviceFilters.java
@@ -70,7 +70,7 @@ public class CLDeviceFilters {
     }
     
     /**
-     * Accepts all devices which support OpenGL-OpenCL interoparability.
+     * Accepts all devices which support OpenGL-OpenCL interoperability.
      */
     public static Filter<CLDevice> glSharing() {
         return new Filter<CLDevice>() {
diff --git a/src/com/jogamp/opencl/util/CLPlatformFilters.java b/src/com/jogamp/opencl/util/CLPlatformFilters.java
index 48d20916..14e1507e 100644
--- a/src/com/jogamp/opencl/util/CLPlatformFilters.java
+++ b/src/com/jogamp/opencl/util/CLPlatformFilters.java
@@ -67,7 +67,7 @@ public class CLPlatformFilters {
     }
     
     /**
-     * Accepts all platforms containing at least one devices of which supports OpenGL-OpenCL interoparability.
+     * Accepts all platforms containing at least one devices of which supports OpenGL-OpenCL interoperability.
      */
     public static Filter<CLPlatform> glSharing() {
         return new Filter<CLPlatform>() {
@@ -86,7 +86,7 @@ public class CLPlatformFilters {
 
     /**
      * Accepts all with the given OpenGL context compatible platforms containing at least one
-     * devices of which supports OpenGL-OpenCL interoparability.
+     * devices of which supports OpenGL-OpenCL interoperability.
      */
     public static Filter<CLPlatform> glSharing(final GLContext context) {
         return new Filter<CLPlatform>() {
@@ -94,10 +94,22 @@ public class CLPlatformFilters {
             public boolean accept(CLPlatform item) {
                 String glVendor = context.getGL().glGetString(GL.GL_VENDOR);
                 String clVendor = item.getVendor();
-                return clVendor.equals(glVendor) && glFilter.accept(item);
+                return areVendorsCompatible(glVendor,clVendor) && glFilter.accept(item);
             }
         };
     }
+    
+    /**
+     * We need this test because on at least some AMD cards, the GL vendor is ATI,
+     * but the CL vendor is AMD.
+     * @param glVendor OpenGL vendor string.
+     * @param clVendor OpenCL vendor string.
+     * @return true if the strings are either the same, or indicate that they're part of the same card.
+     */
+    private static boolean areVendorsCompatible(final String glVendor, final String clVendor) {
+        return(   clVendor.equals(glVendor)
+               || (glVendor.contains("ATI Technologies") && clVendor.contains("Advanced Micro Devices")));
+    }
 
     /**
      * Accepts all platforms supporting the given extensions.
-- 
cgit v1.2.3