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

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

Issue 2291753002: Prevent crash when using getExtension while a PBO is bound. (Closed)
Patch Set: small corrections Created 4 years, 3 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 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 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 } 142 }
143 143
144 protected: 144 protected:
145 void SetUp() override { 145 void SetUp() override {
146 InitializeContext("2.0", "GL_EXT_framebuffer_object"); 146 InitializeContext("2.0", "GL_EXT_framebuffer_object");
147 } 147 }
148 148
149 void InitializeContext(const char* gl_version, const char* extensions) { 149 void InitializeContext(const char* gl_version, const char* extensions) {
150 GpuServiceTest::SetUpWithGLVersion(gl_version, extensions); 150 GpuServiceTest::SetUpWithGLVersion(gl_version, extensions);
151 TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion(gl_.get(), 151 TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion(gl_.get(),
152 extensions, "", gl_version); 152 extensions, "", gl_version, manager_.context_type());
153 feature_info_->InitializeForTesting(); 153 feature_info_->InitializeForTesting();
154 decoder_.reset(new MockGLES2Decoder()); 154 decoder_.reset(new MockGLES2Decoder());
155 manager_.CreateFramebuffer(kClient1Id, kService1Id); 155 manager_.CreateFramebuffer(kClient1Id, kService1Id);
156 error_state_.reset(new ::testing::StrictMock<gles2::MockErrorState>()); 156 error_state_.reset(new ::testing::StrictMock<gles2::MockErrorState>());
157 framebuffer_ = manager_.GetFramebuffer(kClient1Id); 157 framebuffer_ = manager_.GetFramebuffer(kClient1Id);
158 ASSERT_TRUE(framebuffer_ != nullptr); 158 ASSERT_TRUE(framebuffer_ != nullptr);
159 } 159 }
160 160
161 FramebufferManager manager_; 161 FramebufferManager manager_;
162 Framebuffer* framebuffer_; 162 Framebuffer* framebuffer_;
(...skipping 1384 matching lines...) Expand 10 before | Expand all | Expand 10 after
1547 FramebufferInfoES3Test() : FramebufferInfoTestBase(CONTEXT_TYPE_WEBGL2) {} 1547 FramebufferInfoES3Test() : FramebufferInfoTestBase(CONTEXT_TYPE_WEBGL2) {}
1548 1548
1549 protected: 1549 protected:
1550 void SetUp() override { 1550 void SetUp() override {
1551 InitializeContext("OpenGL ES 3.0", ""); 1551 InitializeContext("OpenGL ES 3.0", "");
1552 } 1552 }
1553 1553
1554 void InitializeContext(const char* gl_version, const char* extensions) { 1554 void InitializeContext(const char* gl_version, const char* extensions) {
1555 GpuServiceTest::SetUpWithGLVersion(gl_version, extensions); 1555 GpuServiceTest::SetUpWithGLVersion(gl_version, extensions);
1556 TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion(gl_.get(), 1556 TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion(gl_.get(),
1557 extensions, "", gl_version); 1557 extensions, "", gl_version, manager_.context_type());
1558 feature_info_->InitializeForTesting(CONTEXT_TYPE_OPENGLES3); 1558 feature_info_->InitializeForTesting(CONTEXT_TYPE_OPENGLES3);
1559 decoder_.reset(new MockGLES2Decoder()); 1559 decoder_.reset(new MockGLES2Decoder());
1560 manager_.CreateFramebuffer(kClient1Id, kService1Id); 1560 manager_.CreateFramebuffer(kClient1Id, kService1Id);
1561 error_state_.reset(new ::testing::StrictMock<gles2::MockErrorState>()); 1561 error_state_.reset(new ::testing::StrictMock<gles2::MockErrorState>());
1562 framebuffer_ = manager_.GetFramebuffer(kClient1Id); 1562 framebuffer_ = manager_.GetFramebuffer(kClient1Id);
1563 ASSERT_TRUE(framebuffer_ != nullptr); 1563 ASSERT_TRUE(framebuffer_ != nullptr);
1564 } 1564 }
1565 }; 1565 };
1566 1566
1567 TEST_F(FramebufferInfoES3Test, DifferentDimensions) { 1567 TEST_F(FramebufferInfoES3Test, DifferentDimensions) {
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
1657 renderbuffer_manager_->GetRenderbuffer(kRenderbufferClientId); 1657 renderbuffer_manager_->GetRenderbuffer(kRenderbufferClientId);
1658 ASSERT_TRUE(renderbuffer != nullptr); 1658 ASSERT_TRUE(renderbuffer != nullptr);
1659 framebuffer_->AttachRenderbuffer(GL_COLOR_ATTACHMENT1, renderbuffer); 1659 framebuffer_->AttachRenderbuffer(GL_COLOR_ATTACHMENT1, renderbuffer);
1660 EXPECT_TRUE(framebuffer_->GetReadBufferAttachment()); 1660 EXPECT_TRUE(framebuffer_->GetReadBufferAttachment());
1661 } 1661 }
1662 1662
1663 } // namespace gles2 1663 } // namespace gles2
1664 } // namespace gpu 1664 } // namespace gpu
1665 1665
1666 1666
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/feature_info_unittest.cc ('k') | gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698