Misc. improvements.

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

diff --git a/libhb/openclwrapper.c b/libhb/openclwrapper.c
index 5e9b0a68b6ae03c99fee2f37ac68aaea61bc051b..9254501d9f2651f47463536dd1f179bfc6dd092a 100644 (file)
--- a/libhb/openclwrapper.c
+++ b/libhb/openclwrapper.c
@@ -138,7 +138,9 @@ int hb_confirm_gpu_type()
                 if(!strcmp(dbuff, "Advanced Micro Devices, Inc.") ||\r
 #ifdef __APPLE__\r
                    !strcmp(dbuff, "AMD")                          ||\r
-                   /* MacBook Pro, AMD Radeon HD 6750M, OS X 10.8 */\r
+                   /* MacBook Pro, AMD ATI Radeon HD 6750M, OS X 10.8.3 */\r
+                   !strcmp(dbuff, "NVIDIA")                       ||\r
+                   /* MacBook Pro, NVIDIA GeForce GT 330M,  OS X 10.7.4 */\r
 #endif\r
                    !strcmp(dbuff, "NVIDIA Corporation"))\r
                 {\r
@@ -1088,27 +1090,21 @@ int hb_get_opencl_env()
                                sizeof(cl_device_id) * numDevices,\r
                                devices,\r
                                NULL );\r
-    status = 0;\r
 \r
-    /* dump out each binary into its own separate file. */\r
-    for( i = 0; i < numDevices; i++ )\r
+    for (i = 0; i < numDevices; i++)\r
     {\r
-        if( devices[i] != 0 )\r
+        if (devices[i] != NULL)\r
         {\r
-            char deviceName[1024];\r
-            status = clGetDeviceInfo( devices[i],\r
-                                      CL_DEVICE_NAME,\r
-                                      sizeof(deviceName),\r
-                                      deviceName,\r
-                                      NULL );\r
-            hb_log( "GPU Device Name: %s", deviceName );\r
-            char driverVersion[1024];\r
-            status = clGetDeviceInfo( devices[i],\r
-                                      CL_DRIVER_VERSION,\r
-                                      sizeof(deviceName),\r
-                                      driverVersion,\r
-                                      NULL );\r
-            hb_log( "GPU Driver Version: %s", driverVersion );\r
+            char deviceVendor[100], deviceName[1024], driverVersion[1024];\r
+            clGetDeviceInfo(devices[i], CL_DEVICE_VENDOR, sizeof(deviceVendor),\r
+                            deviceVendor, NULL);\r
+            clGetDeviceInfo(devices[i], CL_DEVICE_NAME, sizeof(deviceName),\r
+                            deviceName, NULL);\r
+            clGetDeviceInfo(devices[i], CL_DRIVER_VERSION, sizeof(driverVersion),\r
+                            driverVersion, NULL);\r
+            hb_log("hb_get_opencl_env: GPU #%d, Device Vendor:  %s", i + 1, deviceVendor);\r
+            hb_log("hb_get_opencl_env: GPU #%d, Device Name:    %s", i + 1, deviceName);\r
+            hb_log("hb_get_opencl_env: GPU #%d, Driver Version: %s", i + 1, driverVersion);\r
         }\r
     }\r
 \r