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

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

Issue 2744663006: Fix skip EXTMultisampleCompatibilityTest.DrawAlphaOneAndResolve (Closed)
Patch Set: GPUTestBotConfig -> GLManager 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 | no next file » | no next file with comments »
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..608735a9be0084bd4c3fb1e0a50aaffe47327c16 100644
--- a/gpu/command_buffer/tests/gl_ext_multisample_compatibility_unittest.cc
+++ b/gpu/command_buffer/tests/gl_ext_multisample_compatibility_unittest.cc
@@ -13,6 +13,7 @@
#include "gpu/command_buffer/tests/gl_test_utils.h"
#include "gpu/config/gpu_test_config.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gl/gl_context.h"
#define SHADER0(Src) #Src
@@ -197,8 +198,8 @@ TEST_F(EXTMultisampleCompatibilityTest, DrawAlphaOneAndResolve) {
#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)));
+ std::string renderer(gl_.context()->GetGLRenderer());
+ std::string version(gl_.context()->GetGLVersion());
if (renderer.find("NVIDIA Tegra") != std::string::npos &&
version.find("OpenGL ES 3.2 NVIDIA 361.00") != std::string::npos)
return;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698