summaryrefslogtreecommitdiffstats
path: root/content/gpu
diff options
context:
space:
mode:
authorzmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-28 01:54:58 +0000
committerzmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-28 01:54:58 +0000
commit30dc645fded83724f54321da25f5612cd1163249 (patch)
tree6e419059359be6bb1da52d537a90cc5af5876674 /content/gpu
parentb2968292db57db2a46c17b0b785f7224a0a63878 (diff)
downloadchromium_src-30dc645fded83724f54321da25f5612cd1163249.zip
chromium_src-30dc645fded83724f54321da25f5612cd1163249.tar.gz
chromium_src-30dc645fded83724f54321da25f5612cd1163249.tar.bz2
Avoid blacklisting GPU features if perf stats are unavailable.
BUG=116350 TEST= R=vangelis Review URL: https://chromiumcodereview.appspot.com/9874004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129338 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/gpu')
-rw-r--r--content/gpu/gpu_info_collector_win.cc14
1 files changed, 13 insertions, 1 deletions
diff --git a/content/gpu/gpu_info_collector_win.cc b/content/gpu/gpu_info_collector_win.cc
index 37cee26..c56d5868 100644
--- a/content/gpu/gpu_info_collector_win.cc
+++ b/content/gpu/gpu_info_collector_win.cc
@@ -71,7 +71,19 @@ content::GpuPerformanceStats RetrieveGpuPerformanceStats() {
hr = assessment->get_Info(&results);
if (FAILED(hr)) {
- LOG(ERROR) << "assessment->get_Info() failed";
+ LOG(ERROR) << "get_Info() failed";
+ break;
+ }
+
+ WINSAT_ASSESSMENT_STATE state = WINSAT_ASSESSMENT_STATE_UNKNOWN;
+ hr = results->get_AssessmentState(&state);
+ if (FAILED(hr)) {
+ LOG(ERROR) << "get_AssessmentState() failed";
+ break;
+ }
+ if (state != WINSAT_ASSESSMENT_STATE_VALID &&
+ state != WINSAT_ASSESSMENT_STATE_INCOHERENT_WITH_HARDWARE) {
+ LOG(ERROR) << "Can't retrieve a valid assessment";
break;
}