diff options
| author | skyostil@chromium.org <skyostil@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-14 11:50:36 +0000 |
|---|---|---|
| committer | skyostil@chromium.org <skyostil@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-14 11:50:36 +0000 |
| commit | 53d6c604a5129e4ebb460726aa1eb926da69ca95 (patch) | |
| tree | 7e1d6e0e511f3b84eed72063083231d35c2268ba /gpu/config | |
| parent | 2051d4b6dfb844647204c3f2e69876e90c0719cf (diff) | |
| download | chromium_src-53d6c604a5129e4ebb460726aa1eb926da69ca95.zip chromium_src-53d6c604a5129e4ebb460726aa1eb926da69ca95.tar.gz chromium_src-53d6c604a5129e4ebb460726aa1eb926da69ca95.tar.bz2 | |
telemetry: Enable GPU-specific test expectations on Android
Make it possible to specify on a GPU vendor/device basis whether a
telemetry test is expected to pass on Android. On desktop and CrOS we
use the PCI device identifiers for this purpose, but they are not
available on Android. Instead, this patch makes lets us match
expectations against the GL_VENDOR and GL_RENDERER strings.
BUG=306462
Review URL: https://codereview.chromium.org/27009002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228446 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/config')
| -rw-r--r-- | gpu/config/gpu_info.h | 1 | ||||
| -rw-r--r-- | gpu/config/gpu_info_collector_android.cc | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/gpu/config/gpu_info.h b/gpu/config/gpu_info.h index 456f4e9..de7a280 100644 --- a/gpu/config/gpu_info.h +++ b/gpu/config/gpu_info.h @@ -36,6 +36,7 @@ struct GPU_EXPORT GPUInfo { // The strings that describe the GPU. // In Linux these strings are obtained through libpci. // In Win/MacOSX, these two strings are not filled at the moment. + // In Android, these are respectively GL_VENDOR and GL_RENDERER. std::string vendor_string; std::string device_string; }; diff --git a/gpu/config/gpu_info_collector_android.cc b/gpu/config/gpu_info_collector_android.cc index f90797b..79428a1 100644 --- a/gpu/config/gpu_info_collector_android.cc +++ b/gpu/config/gpu_info_collector_android.cc @@ -114,6 +114,8 @@ bool CollectBasicGraphicsInfo(GPUInfo* gpu_info) { bool CollectDriverInfoGL(GPUInfo* gpu_info) { gpu_info->driver_version = GetDriverVersionFromString( gpu_info->gl_version_string); + gpu_info->gpu.vendor_string = gpu_info->gl_vendor; + gpu_info->gpu.device_string = gpu_info->gl_renderer; return true; } |