Index: gpu/command_buffer/tests/gl_clear_framebuffer_unittest.cc |
diff --git a/gpu/command_buffer/tests/gl_clear_framebuffer_unittest.cc b/gpu/command_buffer/tests/gl_clear_framebuffer_unittest.cc |
index ff2ca7975be0064d1cf710b9dd5ab77c6e6c1be1..ee20525a2b460e3d77d9b5733b709890a6854f78 100644 |
--- a/gpu/command_buffer/tests/gl_clear_framebuffer_unittest.cc |
+++ b/gpu/command_buffer/tests/gl_clear_framebuffer_unittest.cc |
@@ -45,14 +45,6 @@ class GLClearFramebufferTest : public testing::TestWithParam<bool> { |
} |
} |
- bool IsApplicable() { |
- // The workaround doesn't use VAOs which would cause a failure on a core |
- // context and the hardware for each the workaround is necessary has a buggy |
- // VAO implementation. So we skip testing the workaround on core profiles. |
- return !GetParam() || |
- !gl_.context()->GetVersionInfo()->is_desktop_core_profile; |
- } |
- |
void InitDraw(); |
void SetDrawColor(GLfloat r, GLfloat g, GLfloat b, GLfloat a); |
void SetDrawDepth(GLfloat depth); |
@@ -118,10 +110,6 @@ INSTANTIATE_TEST_CASE_P(GLClearFramebufferTestWithParam, |
::testing::Values(true, false)); |
TEST_P(GLClearFramebufferTest, ClearColor) { |
- if (!IsApplicable()) { |
- return; |
- } |
- |
glClearColor(1.0f, 0.5f, 0.25f, 0.5f); |
glClear(GL_COLOR_BUFFER_BIT); |
@@ -132,10 +120,6 @@ TEST_P(GLClearFramebufferTest, ClearColor) { |
} |
TEST_P(GLClearFramebufferTest, ClearColorWithMask) { |
- if (!IsApplicable()) { |
- return; |
- } |
- |
glColorMask(GL_TRUE, GL_FALSE, GL_FALSE, GL_FALSE); |
glClearColor(1.0f, 1.0f, 1.0f, 1.0f); |
glClear(GL_COLOR_BUFFER_BIT); |
@@ -149,10 +133,6 @@ TEST_P(GLClearFramebufferTest, ClearColorWithMask) { |
// crbug.com/434094 |
#if !defined(OS_MACOSX) |
TEST_P(GLClearFramebufferTest, ClearColorWithScissor) { |
- if (!IsApplicable()) { |
- return; |
- } |
- |
glClearColor(1.0f, 1.0f, 1.0f, 1.0f); |
glClear(GL_COLOR_BUFFER_BIT); |
@@ -173,10 +153,6 @@ TEST_P(GLClearFramebufferTest, ClearColorWithScissor) { |
#endif |
TEST_P(GLClearFramebufferTest, ClearDepthStencil) { |
- if (!IsApplicable()) { |
- return; |
- } |
- |
const GLuint kStencilRef = 1 << 2; |
InitDraw(); |
SetDrawColor(1.0f, 0.0f, 0.0f, 1.0f); |