From: Rodeo <tdskywalker@gmail.com>
Date: Mon, 20 May 2013 18:18:25 +0000 (+0000)
Subject: OpenCL: only allow "AMD" vendor name under OS X for now.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a619e0c6fb25ca88f8d4905d6080e3c55453febc;p=handbrake

OpenCL: only allow "AMD" vendor name under OS X for now.

Also, set the correct gpu_info for that vendor name.



git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/opencl@5488 b64f7644-9d1e-0410-96f1-a4d463321fa5
---

diff --git a/libhb/openclwrapper.c b/libhb/openclwrapper.c
index 8c6796629..9118c1ee4 100644
--- a/libhb/openclwrapper.c
+++ b/libhb/openclwrapper.c
@@ -136,9 +136,11 @@ int hb_confirm_gpu_type()
                 char dbuff[100];
                 status = clGetDeviceInfo(devices[j], CL_DEVICE_VENDOR, sizeof(dbuff), dbuff, NULL); 
                 if(!strcmp(dbuff, "Advanced Micro Devices, Inc.") ||
-                   !strcmp(dbuff, "NVIDIA Corporation")           ||
+#ifdef __APPLE__
+                   !strcmp(dbuff, "AMD")                          ||
                    /* MacBook Pro, AMD Radeon HD 6750M, OS X 10.8 */
-                   !strcmp(dbuff, "AMD"))
+#endif
+                   !strcmp(dbuff, "NVIDIA Corporation"))
                 {
                     return 0;
                 }
@@ -559,7 +561,8 @@ int hb_init_opencl_env( GPUEnv *gpu_info )
                 }
                 gpu_info->platform = platforms[i];
 
-                if( !strcmp( platformName, "Advanced Micro Devices, Inc." ))
+                if (!strcmp(platformName, "Advanced Micro Devices, Inc.") ||
+                    !strcmp(platformName, "AMD"))
                     gpu_info->vendor = AMD;
                 else 
                     gpu_info->vendor = others;