OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/command_line.h" | 5 #include "base/command_line.h" |
6 #include "base/logging.h" | 6 #include "base/logging.h" |
7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
8 #include "gpu/config/gpu_control_list_jsons.h" | 8 #include "gpu/config/gpu_control_list_jsons.h" |
9 #include "gpu/config/gpu_driver_bug_list.h" | 9 #include "gpu/config/gpu_driver_bug_list.h" |
10 #include "gpu/config/gpu_driver_bug_workaround_type.h" | 10 #include "gpu/config/gpu_driver_bug_workaround_type.h" |
(...skipping 14 matching lines...) Expand all Loading... |
25 return gpu_info_; | 25 return gpu_info_; |
26 } | 26 } |
27 | 27 |
28 protected: | 28 protected: |
29 virtual void SetUp() { | 29 virtual void SetUp() { |
30 gpu_info_.gpu.vendor_id = 0x10de; | 30 gpu_info_.gpu.vendor_id = 0x10de; |
31 gpu_info_.gpu.device_id = 0x0640; | 31 gpu_info_.gpu.device_id = 0x0640; |
32 gpu_info_.driver_vendor = "NVIDIA"; | 32 gpu_info_.driver_vendor = "NVIDIA"; |
33 gpu_info_.driver_version = "1.6.18"; | 33 gpu_info_.driver_version = "1.6.18"; |
34 gpu_info_.driver_date = "7-14-2009"; | 34 gpu_info_.driver_date = "7-14-2009"; |
35 gpu_info_.machine_model = "MacBookPro 7.1"; | 35 gpu_info_.machine_model_name = "MacBookPro"; |
| 36 gpu_info_.machine_model_version = "7.1"; |
36 gpu_info_.gl_vendor = "NVIDIA Corporation"; | 37 gpu_info_.gl_vendor = "NVIDIA Corporation"; |
37 gpu_info_.gl_renderer = "NVIDIA GeForce GT 120 OpenGL Engine"; | 38 gpu_info_.gl_renderer = "NVIDIA GeForce GT 120 OpenGL Engine"; |
38 gpu_info_.performance_stats.graphics = 5.0; | 39 gpu_info_.performance_stats.graphics = 5.0; |
39 gpu_info_.performance_stats.gaming = 5.0; | 40 gpu_info_.performance_stats.gaming = 5.0; |
40 gpu_info_.performance_stats.overall = 5.0; | 41 gpu_info_.performance_stats.overall = 5.0; |
41 } | 42 } |
42 | 43 |
43 virtual void TearDown() { | 44 virtual void TearDown() { |
44 } | 45 } |
45 | 46 |
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
202 EXPECT_EQ(1u, bugs.count(DISABLE_D3D11)); | 203 EXPECT_EQ(1u, bugs.count(DISABLE_D3D11)); |
203 | 204 |
204 // test a higher driver version number | 205 // test a higher driver version number |
205 gpu_info.driver_version = "9.18.13.2723"; | 206 gpu_info.driver_version = "9.18.13.2723"; |
206 bugs = list->MakeDecision(GpuControlList::kOsWin, "7.0", gpu_info); | 207 bugs = list->MakeDecision(GpuControlList::kOsWin, "7.0", gpu_info); |
207 EXPECT_EQ(0u, bugs.count(DISABLE_D3D11)); | 208 EXPECT_EQ(0u, bugs.count(DISABLE_D3D11)); |
208 } | 209 } |
209 | 210 |
210 } // namespace gpu | 211 } // namespace gpu |
211 | 212 |
OLD | NEW |