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

Unified Diff: gpu/command_buffer/tests/gl_ext_multisample_compatibility_unittest.cc

Issue 2744663006: Fix skip EXTMultisampleCompatibilityTest.DrawAlphaOneAndResolve (Closed)
Patch Set: GPUInfo -> GPUTestBotConfig Created 3 years, 9 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 | « no previous file | gpu/config/gpu_test_config.h » ('j') | gpu/config/gpu_test_config.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « no previous file | gpu/config/gpu_test_config.h » ('j') | gpu/config/gpu_test_config.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698