| OLD | NEW |
| 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" |
| 11 #include "gpu/command_buffer/service/gles2_cmd_decoder_mock.h" | 11 #include "gpu/command_buffer/service/gles2_cmd_decoder_mock.h" |
| 12 #include "gpu/command_buffer/service/gpu_service_test.h" | 12 #include "gpu/command_buffer/service/gpu_service_test.h" |
| 13 #include "gpu/command_buffer/service/progress_reporter_stub.h" |
| 13 #include "gpu/command_buffer/service/renderbuffer_manager.h" | 14 #include "gpu/command_buffer/service/renderbuffer_manager.h" |
| 14 #include "gpu/command_buffer/service/test_helper.h" | 15 #include "gpu/command_buffer/service/test_helper.h" |
| 15 #include "gpu/command_buffer/service/texture_manager.h" | 16 #include "gpu/command_buffer/service/texture_manager.h" |
| 16 #include "testing/gtest/include/gtest/gtest.h" | 17 #include "testing/gtest/include/gtest/gtest.h" |
| 17 #include "ui/gl/gl_mock.h" | 18 #include "ui/gl/gl_mock.h" |
| 18 | 19 |
| 19 using ::testing::_; | 20 using ::testing::_; |
| 20 using ::testing::Return; | 21 using ::testing::Return; |
| 21 | 22 |
| 22 namespace gpu { | 23 namespace gpu { |
| (...skipping 26 matching lines...) Expand all Loading... |
| 49 kMax3DTextureSize, | 50 kMax3DTextureSize, |
| 50 kMaxArrayTextureLayers, | 51 kMaxArrayTextureLayers, |
| 51 kUseDefaultTextures)); | 52 kUseDefaultTextures)); |
| 52 renderbuffer_manager_.reset(new RenderbufferManager(nullptr, | 53 renderbuffer_manager_.reset(new RenderbufferManager(nullptr, |
| 53 kMaxRenderbufferSize, | 54 kMaxRenderbufferSize, |
| 54 kMaxSamples, | 55 kMaxSamples, |
| 55 feature_info_.get())); | 56 feature_info_.get())); |
| 56 } | 57 } |
| 57 ~FramebufferManagerTest() override { | 58 ~FramebufferManagerTest() override { |
| 58 manager_.Destroy(false); | 59 manager_.Destroy(false); |
| 59 texture_manager_->Destroy(false); | 60 ProgressReporterStub progress_reporter; |
| 61 texture_manager_->Destroy(false, &progress_reporter); |
| 60 renderbuffer_manager_->Destroy(false); | 62 renderbuffer_manager_->Destroy(false); |
| 61 } | 63 } |
| 62 | 64 |
| 63 protected: | 65 protected: |
| 64 FramebufferManager manager_; | 66 FramebufferManager manager_; |
| 65 scoped_refptr<FeatureInfo> feature_info_; | 67 scoped_refptr<FeatureInfo> feature_info_; |
| 66 std::unique_ptr<TextureManager> texture_manager_; | 68 std::unique_ptr<TextureManager> texture_manager_; |
| 67 std::unique_ptr<RenderbufferManager> renderbuffer_manager_; | 69 std::unique_ptr<RenderbufferManager> renderbuffer_manager_; |
| 68 }; | 70 }; |
| 69 | 71 |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 kMax3DTextureSize, | 132 kMax3DTextureSize, |
| 131 kMaxArrayTextureLayers, | 133 kMaxArrayTextureLayers, |
| 132 kUseDefaultTextures)); | 134 kUseDefaultTextures)); |
| 133 renderbuffer_manager_.reset(new RenderbufferManager(nullptr, | 135 renderbuffer_manager_.reset(new RenderbufferManager(nullptr, |
| 134 kMaxRenderbufferSize, | 136 kMaxRenderbufferSize, |
| 135 kMaxSamples, | 137 kMaxSamples, |
| 136 feature_info_.get())); | 138 feature_info_.get())); |
| 137 } | 139 } |
| 138 ~FramebufferInfoTestBase() override { | 140 ~FramebufferInfoTestBase() override { |
| 139 manager_.Destroy(false); | 141 manager_.Destroy(false); |
| 140 texture_manager_->Destroy(false); | 142 ProgressReporterStub progress_reporter; |
| 143 texture_manager_->Destroy(false, &progress_reporter); |
| 141 renderbuffer_manager_->Destroy(false); | 144 renderbuffer_manager_->Destroy(false); |
| 142 } | 145 } |
| 143 | 146 |
| 144 protected: | 147 protected: |
| 145 void SetUp() override { | 148 void SetUp() override { |
| 146 InitializeContext("2.0", "GL_EXT_framebuffer_object"); | 149 InitializeContext("2.0", "GL_EXT_framebuffer_object"); |
| 147 } | 150 } |
| 148 | 151 |
| 149 void InitializeContext(const char* gl_version, const char* extensions) { | 152 void InitializeContext(const char* gl_version, const char* extensions) { |
| 150 GpuServiceTest::SetUpWithGLVersion(gl_version, extensions); | 153 GpuServiceTest::SetUpWithGLVersion(gl_version, extensions); |
| (...skipping 1516 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1667 renderbuffer_manager_->GetRenderbuffer(kRenderbufferClientId); | 1670 renderbuffer_manager_->GetRenderbuffer(kRenderbufferClientId); |
| 1668 ASSERT_TRUE(renderbuffer != nullptr); | 1671 ASSERT_TRUE(renderbuffer != nullptr); |
| 1669 framebuffer_->AttachRenderbuffer(GL_COLOR_ATTACHMENT1, renderbuffer); | 1672 framebuffer_->AttachRenderbuffer(GL_COLOR_ATTACHMENT1, renderbuffer); |
| 1670 EXPECT_TRUE(framebuffer_->GetReadBufferAttachment()); | 1673 EXPECT_TRUE(framebuffer_->GetReadBufferAttachment()); |
| 1671 } | 1674 } |
| 1672 | 1675 |
| 1673 } // namespace gles2 | 1676 } // namespace gles2 |
| 1674 } // namespace gpu | 1677 } // namespace gpu |
| 1675 | 1678 |
| 1676 | 1679 |
| OLD | NEW |