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

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

Issue 2378583003: Ping watchdog thread during GpuChannel destruction (Closed)
Patch Set: Fix lifetime and use nullptr 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 23 matching lines...) Expand all
34 const uint32_t kMaxColorAttachments = 16; 34 const uint32_t kMaxColorAttachments = 16;
35 const bool kUseDefaultTextures = false; 35 const bool kUseDefaultTextures = false;
36 36
37 } // namespace 37 } // namespace
38 38
39 class FramebufferManagerTest : public GpuServiceTest { 39 class FramebufferManagerTest : public GpuServiceTest {
40 public: 40 public:
41 FramebufferManagerTest() 41 FramebufferManagerTest()
42 : manager_(1, 1, nullptr), 42 : manager_(1, 1, nullptr),
43 feature_info_(new FeatureInfo()) { 43 feature_info_(new FeatureInfo()) {
44 texture_manager_.reset(new TextureManager(nullptr, 44 texture_manager_.reset(new TextureManager(
45 feature_info_.get(), 45 nullptr, feature_info_.get(), kMaxTextureSize, kMaxCubemapSize,
46 kMaxTextureSize, 46 kMaxRectangleTextureSize, kMax3DTextureSize, kMaxArrayTextureLayers,
47 kMaxCubemapSize, 47 kUseDefaultTextures, nullptr));
48 kMaxRectangleTextureSize,
49 kMax3DTextureSize,
50 kMaxArrayTextureLayers,
51 kUseDefaultTextures));
52 renderbuffer_manager_.reset(new RenderbufferManager(nullptr, 48 renderbuffer_manager_.reset(new RenderbufferManager(nullptr,
53 kMaxRenderbufferSize, 49 kMaxRenderbufferSize,
54 kMaxSamples, 50 kMaxSamples,
55 feature_info_.get())); 51 feature_info_.get()));
56 } 52 }
57 ~FramebufferManagerTest() override { 53 ~FramebufferManagerTest() override {
58 manager_.Destroy(false); 54 manager_.Destroy(false);
59 texture_manager_->Destroy(false); 55 texture_manager_->Destroy(false);
60 renderbuffer_manager_->Destroy(false); 56 renderbuffer_manager_->Destroy(false);
61 } 57 }
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 public: 111 public:
116 static const GLuint kClient1Id = 1; 112 static const GLuint kClient1Id = 1;
117 static const GLuint kService1Id = 11; 113 static const GLuint kService1Id = 11;
118 114
119 explicit FramebufferInfoTestBase(ContextType context_type) 115 explicit FramebufferInfoTestBase(ContextType context_type)
120 : context_type_(context_type), 116 : context_type_(context_type),
121 manager_(kMaxDrawBuffers, 117 manager_(kMaxDrawBuffers,
122 kMaxColorAttachments, 118 kMaxColorAttachments,
123 new FramebufferCompletenessCache), 119 new FramebufferCompletenessCache),
124 feature_info_(new FeatureInfo()) { 120 feature_info_(new FeatureInfo()) {
125 texture_manager_.reset(new TextureManager(nullptr, 121 texture_manager_.reset(new TextureManager(
126 feature_info_.get(), 122 nullptr, feature_info_.get(), kMaxTextureSize, kMaxCubemapSize,
127 kMaxTextureSize, 123 kMaxRectangleTextureSize, kMax3DTextureSize, kMaxArrayTextureLayers,
128 kMaxCubemapSize, 124 kUseDefaultTextures, nullptr));
129 kMaxRectangleTextureSize,
130 kMax3DTextureSize,
131 kMaxArrayTextureLayers,
132 kUseDefaultTextures));
133 renderbuffer_manager_.reset(new RenderbufferManager(nullptr, 125 renderbuffer_manager_.reset(new RenderbufferManager(nullptr,
134 kMaxRenderbufferSize, 126 kMaxRenderbufferSize,
135 kMaxSamples, 127 kMaxSamples,
136 feature_info_.get())); 128 feature_info_.get()));
137 } 129 }
138 ~FramebufferInfoTestBase() override { 130 ~FramebufferInfoTestBase() override {
139 manager_.Destroy(false); 131 manager_.Destroy(false);
140 texture_manager_->Destroy(false); 132 texture_manager_->Destroy(false);
141 renderbuffer_manager_->Destroy(false); 133 renderbuffer_manager_->Destroy(false);
142 } 134 }
(...skipping 1517 matching lines...) Expand 10 before | Expand all | Expand 10 after
1660 renderbuffer_manager_->GetRenderbuffer(kRenderbufferClientId); 1652 renderbuffer_manager_->GetRenderbuffer(kRenderbufferClientId);
1661 ASSERT_TRUE(renderbuffer != nullptr); 1653 ASSERT_TRUE(renderbuffer != nullptr);
1662 framebuffer_->AttachRenderbuffer(GL_COLOR_ATTACHMENT1, renderbuffer); 1654 framebuffer_->AttachRenderbuffer(GL_COLOR_ATTACHMENT1, renderbuffer);
1663 EXPECT_TRUE(framebuffer_->GetReadBufferAttachment()); 1655 EXPECT_TRUE(framebuffer_->GetReadBufferAttachment());
1664 } 1656 }
1665 1657
1666 } // namespace gles2 1658 } // namespace gles2
1667 } // namespace gpu 1659 } // namespace gpu
1668 1660
1669 1661
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698