| Index: gpu/command_buffer/tests/gl_ext_multisample_compatibility_unittest.cc
|
| diff --git a/gpu/command_buffer/tests/gl_ext_multisample_compatibility_unittest.cc b/gpu/command_buffer/tests/gl_ext_multisample_compatibility_unittest.cc
|
| index b618eccd9eec7df970289e1acd39359ccf34721f..866bbe50757b883399695800b270702456a76d6d 100644
|
| --- a/gpu/command_buffer/tests/gl_ext_multisample_compatibility_unittest.cc
|
| +++ b/gpu/command_buffer/tests/gl_ext_multisample_compatibility_unittest.cc
|
| @@ -195,14 +195,12 @@ TEST_F(EXTMultisampleCompatibilityTest, DrawAlphaOneAndResolve) {
|
| return;
|
| }
|
|
|
| -#if defined(OS_ANDROID)
|
| // TODO: Figure out why this fails on NVIDIA Shield. crbug.com/700060.
|
| - std::string renderer(reinterpret_cast<const char*>(glGetString(GL_RENDERER)));
|
| - std::string version(reinterpret_cast<const char*>(glGetString(GL_VERSION)));
|
| - if (renderer.find("NVIDIA Tegra") != std::string::npos &&
|
| - version.find("OpenGL ES 3.2 NVIDIA 361.00") != std::string::npos)
|
| + gpu::GPUTestBotConfig bot_config;
|
| + gpu::GPUTestConfig config;
|
| + config.set_machine_model_name("sb_na_wf");
|
| + if (bot_config.LoadCurrentConfig(nullptr) && bot_config.Matches(config))
|
| return;
|
| -#endif
|
|
|
| // SAMPLE_ALPHA_TO_ONE is specified to transform alpha values of
|
| // covered samples to 1.0. In order to detect it, we use non-1.0
|
|
|