Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1139)

Side by Side Diff: gpu/config/gpu_info_collector_unittest.cc

Issue 2198243002: Revert of On Linux rework driver_version/vendor extraction from gl version (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « gpu/config/gpu_info_collector_linux.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <stddef.h> 5 #include <stddef.h>
6 #include <stdint.h> 6 #include <stdint.h>
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/strings/string_split.h" 10 #include "base/strings/string_split.h"
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 #elif defined(OS_MACOSX) 286 #elif defined(OS_MACOSX)
287 {"Intel Iris Pro OpenGL Engine", 287 {"Intel Iris Pro OpenGL Engine",
288 "Intel Inc.", 288 "Intel Inc.",
289 "2.1 INTEL-10.6.20", 289 "2.1 INTEL-10.6.20",
290 "10.6.20"}, 290 "10.6.20"},
291 #elif defined(OS_LINUX) 291 #elif defined(OS_LINUX)
292 {"Quadro K2000/PCIe/SSE2", 292 {"Quadro K2000/PCIe/SSE2",
293 "NVIDIA Corporation", 293 "NVIDIA Corporation",
294 "4.4.0 NVIDIA 331.79", 294 "4.4.0 NVIDIA 331.79",
295 "331.79"}, 295 "331.79"},
296 {"Gallium 0.4 on NVE7",
297 "nouveau",
298 "3.3 (Core Profile) Mesa 10.5.9",
299 "10.5.9"},
300 {"Mesa DRI Intel(R) Haswell Mobile",
301 "Intel Open Source Technology Center",
302 "OpenGL ES 3.0 Mesa 12.1.0-devel (git-ed9dd3b)",
303 "12.1.0"},
304 #endif 296 #endif
305 {NULL, NULL, NULL, NULL} 297 {NULL, NULL, NULL, NULL}
306 }; 298 };
307 299
308 GPUInfo gpu_info; 300 GPUInfo gpu_info;
309 for (int i = 0; kTestStrings[i].gl_renderer != NULL; ++i) { 301 for (int i = 0; kTestStrings[i].gl_renderer != NULL; ++i) {
310 gpu_info.gl_renderer = kTestStrings[i].gl_renderer; 302 gpu_info.gl_renderer = kTestStrings[i].gl_renderer;
311 gpu_info.gl_vendor = kTestStrings[i].gl_vendor; 303 gpu_info.gl_vendor = kTestStrings[i].gl_vendor;
312 gpu_info.gl_version = kTestStrings[i].gl_version; 304 gpu_info.gl_version = kTestStrings[i].gl_version;
313 EXPECT_EQ(CollectDriverInfoGL(&gpu_info), kCollectInfoSuccess); 305 EXPECT_EQ(CollectDriverInfoGL(&gpu_info), kCollectInfoSuccess);
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
362 354
363 gpu_info.gl_vendor = "Google Corporation"; 355 gpu_info.gl_vendor = "Google Corporation";
364 gpu_info.gl_renderer = "Chrome GPU Team"; 356 gpu_info.gl_renderer = "Chrome GPU Team";
365 IdentifyActiveGPU(&gpu_info); 357 IdentifyActiveGPU(&gpu_info);
366 EXPECT_FALSE(gpu_info.gpu.active); 358 EXPECT_FALSE(gpu_info.gpu.active);
367 EXPECT_FALSE(gpu_info.secondary_gpus[0].active); 359 EXPECT_FALSE(gpu_info.secondary_gpus[0].active);
368 } 360 }
369 361
370 } // namespace gpu 362 } // namespace gpu
371 363
OLDNEW
« no previous file with comments | « gpu/config/gpu_info_collector_linux.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698