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

Unified Diff: gpu/config/gpu_info_collector_android.cc

Issue 2227893005: Fix a few gpu tests on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Make DriverBugWorkaroundsUponGLRendererPage more robust on Android 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/test/gpu/page_sets/gpu_process_tests.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/config/gpu_info_collector_android.cc
diff --git a/gpu/config/gpu_info_collector_android.cc b/gpu/config/gpu_info_collector_android.cc
index 1312e357fbac8b27106a0a830ebd29fb37e77501..3ae3d66d25738368e7d6754e90a8fa4f9bead803 100644
--- a/gpu/config/gpu_info_collector_android.cc
+++ b/gpu/config/gpu_info_collector_android.cc
@@ -18,6 +18,7 @@
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
+#include "gpu/config/gpu_switches.h"
#include "ui/gl/egl_util.h"
#include "ui/gl/gl_bindings.h"
#include "ui/gl/gl_context.h"
@@ -205,6 +206,20 @@ gpu::CollectInfoResult CollectDriverInfo(gpu::GPUInfo* gpu_info) {
gpu_info->gl_extensions =
reinterpret_cast<const char*>(glGetStringFn(GL_EXTENSIONS));
+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+ if (command_line->HasSwitch(switches::kGpuTestingGLVendor)) {
+ gpu_info->gl_vendor =
+ command_line->GetSwitchValueASCII(switches::kGpuTestingGLVendor);
+ }
+ if (command_line->HasSwitch(switches::kGpuTestingGLRenderer)) {
+ gpu_info->gl_renderer =
+ command_line->GetSwitchValueASCII(switches::kGpuTestingGLRenderer);
+ }
+ if (command_line->HasSwitch(switches::kGpuTestingGLVersion)) {
+ gpu_info->gl_version =
+ command_line->GetSwitchValueASCII(switches::kGpuTestingGLVersion);
+ }
+
GLint max_samples = 0;
glGetIntegervFn(GL_MAX_SAMPLES, &max_samples);
gpu_info->max_msaa_samples = base::IntToString(max_samples);
« no previous file with comments | « content/test/gpu/page_sets/gpu_process_tests.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698