Index: gpu/command_buffer/service/framebuffer_manager_unittest.cc |
diff --git a/gpu/command_buffer/service/framebuffer_manager_unittest.cc b/gpu/command_buffer/service/framebuffer_manager_unittest.cc |
index 1884200a53ac48986058a2f7cd5e7282bd625709..9da2df6039fad79c211b59eebd3bf22dddd6a00b 100644 |
--- a/gpu/command_buffer/service/framebuffer_manager_unittest.cc |
+++ b/gpu/command_buffer/service/framebuffer_manager_unittest.cc |
@@ -135,14 +135,18 @@ class FramebufferInfoTestBase : public GpuServiceTest { |
protected: |
void SetUp() override { |
- InitializeContext("2.0", "GL_EXT_framebuffer_object"); |
+ bool is_es3 = false; |
+ if (context_type_ == CONTEXT_TYPE_WEBGL2 || |
+ context_type_ == CONTEXT_TYPE_OPENGLES3) |
+ is_es3 = true; |
+ InitializeContext(is_es3 ? "3.0" : "2.0", "GL_EXT_framebuffer_object"); |
} |
void InitializeContext(const char* gl_version, const char* extensions) { |
GpuServiceTest::SetUpWithGLVersion(gl_version, extensions); |
TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion(gl_.get(), |
extensions, "", gl_version, context_type_); |
- feature_info_->InitializeForTesting(); |
+ feature_info_->InitializeForTesting(context_type_); |
decoder_.reset(new MockGLES2Decoder()); |
manager_.CreateFramebuffer(kClient1Id, kService1Id); |
error_state_.reset(new ::testing::StrictMock<gles2::MockErrorState>()); |
@@ -162,7 +166,7 @@ class FramebufferInfoTestBase : public GpuServiceTest { |
class FramebufferInfoTest : public FramebufferInfoTestBase { |
public: |
- FramebufferInfoTest() : FramebufferInfoTestBase(CONTEXT_TYPE_OPENGLES2) {} |
+ FramebufferInfoTest() : FramebufferInfoTestBase(CONTEXT_TYPE_OPENGLES3) {} |
}; |
// GCC requires these declarations, but MSVC requires they not be present |
@@ -1278,11 +1282,10 @@ TEST_F(FramebufferInfoTest, DrawBufferMasks) { |
framebuffer_->ValidateAndAdjustDrawBuffers(0x310u, 0x330u)); |
} |
-class FramebufferInfoFloatTest : public FramebufferInfoTest { |
+class FramebufferInfoFloatTest : public FramebufferInfoTestBase { |
public: |
FramebufferInfoFloatTest() |
- : FramebufferInfoTest() { |
- } |
+ : FramebufferInfoTestBase(CONTEXT_TYPE_OPENGLES3) {} |
~FramebufferInfoFloatTest() override {} |
protected: |
@@ -1547,18 +1550,6 @@ class FramebufferInfoES3Test : public FramebufferInfoTestBase { |
void SetUp() override { |
InitializeContext("OpenGL ES 3.0", ""); |
} |
- |
- void InitializeContext(const char* gl_version, const char* extensions) { |
- GpuServiceTest::SetUpWithGLVersion(gl_version, extensions); |
- TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion(gl_.get(), |
- extensions, "", gl_version, context_type_); |
- feature_info_->InitializeForTesting(CONTEXT_TYPE_OPENGLES3); |
- decoder_.reset(new MockGLES2Decoder()); |
- manager_.CreateFramebuffer(kClient1Id, kService1Id); |
- error_state_.reset(new ::testing::StrictMock<gles2::MockErrorState>()); |
- framebuffer_ = manager_.GetFramebuffer(kClient1Id); |
- ASSERT_TRUE(framebuffer_ != nullptr); |
- } |
}; |
TEST_F(FramebufferInfoES3Test, DifferentDimensions) { |