commit 93f5dcc3feee8b90df4346bff860aa2e37eee170
author zmo@google.com <zmo@google.com@0039d316-1c4b-4281-b951-d872f2087c98> Wed Mar 02 22:05:48 2011
committer zmo@google.com <zmo@google.com@0039d316-1c4b-4281-b951-d872f2087c98> Wed Mar 02 22:05:48 2011
tree 9074391aa9c0c492613565dfb139c7a2d591ce88
parent 26b627e55c5e9c1bd4d00bb6613fea7a6cb2c463

Add older ATI/NVidia/Intel drivers in XP to software rendering list, and remove the original no-XP entry.BUG=74212TEST=none
Review URL: http://codereview.chromium.org/6594098

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76625 0039d316-1c4b-4281-b951-d872f2087c98

chrome/gpu/gpu_info_collector_win.cc

diff --git a/chrome/gpu/gpu_info_collector_win.cc b/chrome/gpu/gpu_info_collector_win.cc
index 6f5fa19..85be092b 100644
--- a/chrome/gpu/gpu_info_collector_win.cc
+++ b/chrome/gpu/gpu_info_collector_win.cc
@@ -91,7 +91,7 @@
 bool CollectPreliminaryGraphicsInfo(GPUInfo* gpu_info) {
   DCHECK(gpu_info);
 
-  gpu_info->SetLevel(GPUInfo::kPartial);
+  gpu_info->SetLevel(GPUInfo::kPreliminary);
 
   bool rt = true;
   if (!CollectVideoCardInfo(gpu_info))
@@ -155,10 +155,8 @@
     base::HexStringToInt(WideToASCII(vendor_id_string), &vendor_id);
     base::HexStringToInt(WideToASCII(device_id_string), &device_id);
     gpu_info->SetVideoCardInfo(vendor_id, device_id);
-    // TODO(zmo): need a better way to identify if ANGLE is used.
-    if (gfx::GetGLImplementation() == gfx::kGLImplementationEGLGLES2)
-      return CollectDriverInfoD3D(id, gpu_info);
-    return true;
+    // TODO(zmo): we only need to call CollectDriverInfoD3D() if we use ANGLE.
+    return CollectDriverInfoD3D(id, gpu_info);
   }
   return false;
 }