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

Side by Side Diff: gpu/command_buffer/service/framebuffer_manager_unittest.cc

Issue 2443553002: Create correct GLES3 context for GLES3 unittest (Closed)
Patch Set: remove context_type since it is equivalent to enable_es3 Created 4 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <stddef.h> 5 #include <stddef.h>
6 #include <stdint.h> 6 #include <stdint.h>
7 7
8 #include "gpu/command_buffer/service/error_state_mock.h" 8 #include "gpu/command_buffer/service/error_state_mock.h"
9 #include "gpu/command_buffer/service/feature_info.h" 9 #include "gpu/command_buffer/service/feature_info.h"
10 #include "gpu/command_buffer/service/framebuffer_manager.h" 10 #include "gpu/command_buffer/service/framebuffer_manager.h"
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 bool is_es3 = false; 138 bool is_es3 = false;
139 if (context_type_ == CONTEXT_TYPE_WEBGL2 || 139 if (context_type_ == CONTEXT_TYPE_WEBGL2 ||
140 context_type_ == CONTEXT_TYPE_OPENGLES3) 140 context_type_ == CONTEXT_TYPE_OPENGLES3)
141 is_es3 = true; 141 is_es3 = true;
142 InitializeContext(is_es3 ? "3.0" : "2.0", "GL_EXT_framebuffer_object"); 142 InitializeContext(is_es3 ? "3.0" : "2.0", "GL_EXT_framebuffer_object");
143 } 143 }
144 144
145 void InitializeContext(const char* gl_version, const char* extensions) { 145 void InitializeContext(const char* gl_version, const char* extensions) {
146 GpuServiceTest::SetUpWithGLVersion(gl_version, extensions); 146 GpuServiceTest::SetUpWithGLVersion(gl_version, extensions);
147 TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion(gl_.get(), 147 TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion(gl_.get(),
148 extensions, "", gl_version, context_type_); 148 extensions, "", gl_version);
149 feature_info_->InitializeForTesting(context_type_); 149 feature_info_->InitializeForTesting(context_type_);
150 decoder_.reset(new MockGLES2Decoder()); 150 decoder_.reset(new MockGLES2Decoder());
151 manager_.CreateFramebuffer(kClient1Id, kService1Id); 151 manager_.CreateFramebuffer(kClient1Id, kService1Id);
152 error_state_.reset(new ::testing::StrictMock<gles2::MockErrorState>()); 152 error_state_.reset(new ::testing::StrictMock<gles2::MockErrorState>());
153 framebuffer_ = manager_.GetFramebuffer(kClient1Id); 153 framebuffer_ = manager_.GetFramebuffer(kClient1Id);
154 ASSERT_TRUE(framebuffer_ != nullptr); 154 ASSERT_TRUE(framebuffer_ != nullptr);
155 } 155 }
156 156
157 ContextType context_type_; 157 ContextType context_type_;
158 FramebufferManager manager_; 158 FramebufferManager manager_;
(...skipping 1484 matching lines...) Expand 10 before | Expand all | Expand 10 after
1643 renderbuffer_manager_->GetRenderbuffer(kRenderbufferClientId); 1643 renderbuffer_manager_->GetRenderbuffer(kRenderbufferClientId);
1644 ASSERT_TRUE(renderbuffer != nullptr); 1644 ASSERT_TRUE(renderbuffer != nullptr);
1645 framebuffer_->AttachRenderbuffer(GL_COLOR_ATTACHMENT1, renderbuffer); 1645 framebuffer_->AttachRenderbuffer(GL_COLOR_ATTACHMENT1, renderbuffer);
1646 EXPECT_TRUE(framebuffer_->GetReadBufferAttachment()); 1646 EXPECT_TRUE(framebuffer_->GetReadBufferAttachment());
1647 } 1647 }
1648 1648
1649 } // namespace gles2 1649 } // namespace gles2
1650 } // namespace gpu 1650 } // namespace gpu
1651 1651
1652 1652
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698