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

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

Issue 2378583003: Ping watchdog thread during GpuChannel destruction (Closed)
Patch Set: remove throttling Created 4 years, 2 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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 kMax3DTextureSize, 49 kMax3DTextureSize,
50 kMaxArrayTextureLayers, 50 kMaxArrayTextureLayers,
51 kUseDefaultTextures)); 51 kUseDefaultTextures));
52 renderbuffer_manager_.reset(new RenderbufferManager(nullptr, 52 renderbuffer_manager_.reset(new RenderbufferManager(nullptr,
53 kMaxRenderbufferSize, 53 kMaxRenderbufferSize,
54 kMaxSamples, 54 kMaxSamples,
55 feature_info_.get())); 55 feature_info_.get()));
56 } 56 }
57 ~FramebufferManagerTest() override { 57 ~FramebufferManagerTest() override {
58 manager_.Destroy(false); 58 manager_.Destroy(false);
59 texture_manager_->Destroy(false); 59 texture_manager_->Destroy(false, nullptr);
60 renderbuffer_manager_->Destroy(false); 60 renderbuffer_manager_->Destroy(false);
61 } 61 }
62 62
63 protected: 63 protected:
64 FramebufferManager manager_; 64 FramebufferManager manager_;
65 scoped_refptr<FeatureInfo> feature_info_; 65 scoped_refptr<FeatureInfo> feature_info_;
66 std::unique_ptr<TextureManager> texture_manager_; 66 std::unique_ptr<TextureManager> texture_manager_;
67 std::unique_ptr<RenderbufferManager> renderbuffer_manager_; 67 std::unique_ptr<RenderbufferManager> renderbuffer_manager_;
68 }; 68 };
69 69
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 kMax3DTextureSize, 130 kMax3DTextureSize,
131 kMaxArrayTextureLayers, 131 kMaxArrayTextureLayers,
132 kUseDefaultTextures)); 132 kUseDefaultTextures));
133 renderbuffer_manager_.reset(new RenderbufferManager(nullptr, 133 renderbuffer_manager_.reset(new RenderbufferManager(nullptr,
134 kMaxRenderbufferSize, 134 kMaxRenderbufferSize,
135 kMaxSamples, 135 kMaxSamples,
136 feature_info_.get())); 136 feature_info_.get()));
137 } 137 }
138 ~FramebufferInfoTestBase() override { 138 ~FramebufferInfoTestBase() override {
139 manager_.Destroy(false); 139 manager_.Destroy(false);
140 texture_manager_->Destroy(false); 140 texture_manager_->Destroy(false, nullptr);
141 renderbuffer_manager_->Destroy(false); 141 renderbuffer_manager_->Destroy(false);
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);
(...skipping 1516 matching lines...) Expand 10 before | Expand all | Expand 10 after
1667 renderbuffer_manager_->GetRenderbuffer(kRenderbufferClientId); 1667 renderbuffer_manager_->GetRenderbuffer(kRenderbufferClientId);
1668 ASSERT_TRUE(renderbuffer != nullptr); 1668 ASSERT_TRUE(renderbuffer != nullptr);
1669 framebuffer_->AttachRenderbuffer(GL_COLOR_ATTACHMENT1, renderbuffer); 1669 framebuffer_->AttachRenderbuffer(GL_COLOR_ATTACHMENT1, renderbuffer);
1670 EXPECT_TRUE(framebuffer_->GetReadBufferAttachment()); 1670 EXPECT_TRUE(framebuffer_->GetReadBufferAttachment());
1671 } 1671 }
1672 1672
1673 } // namespace gles2 1673 } // namespace gles2
1674 } // namespace gpu 1674 } // namespace gpu
1675 1675
1676 1676
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698