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

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

Issue 1498033003: Implement SamplerManager in the command buffer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed unnessecary state initialization Created 5 years 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
« no previous file with comments | « gpu/command_buffer/service/context_group.h ('k') | gpu/command_buffer/service/context_state.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "gpu/command_buffer/service/context_group.h" 5 #include "gpu/command_buffer/service/context_group.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "gpu/command_buffer/common/value_state.h" 11 #include "gpu/command_buffer/common/value_state.h"
12 #include "gpu/command_buffer/service/buffer_manager.h" 12 #include "gpu/command_buffer/service/buffer_manager.h"
13 #include "gpu/command_buffer/service/framebuffer_manager.h" 13 #include "gpu/command_buffer/service/framebuffer_manager.h"
14 #include "gpu/command_buffer/service/gpu_switches.h" 14 #include "gpu/command_buffer/service/gpu_switches.h"
15 #include "gpu/command_buffer/service/mailbox_manager_impl.h" 15 #include "gpu/command_buffer/service/mailbox_manager_impl.h"
16 #include "gpu/command_buffer/service/path_manager.h" 16 #include "gpu/command_buffer/service/path_manager.h"
17 #include "gpu/command_buffer/service/program_manager.h" 17 #include "gpu/command_buffer/service/program_manager.h"
18 #include "gpu/command_buffer/service/renderbuffer_manager.h" 18 #include "gpu/command_buffer/service/renderbuffer_manager.h"
19 #include "gpu/command_buffer/service/sampler_manager.h"
19 #include "gpu/command_buffer/service/shader_manager.h" 20 #include "gpu/command_buffer/service/shader_manager.h"
20 #include "gpu/command_buffer/service/texture_manager.h" 21 #include "gpu/command_buffer/service/texture_manager.h"
21 #include "gpu/command_buffer/service/transfer_buffer_manager.h" 22 #include "gpu/command_buffer/service/transfer_buffer_manager.h"
22 #include "gpu/command_buffer/service/valuebuffer_manager.h" 23 #include "gpu/command_buffer/service/valuebuffer_manager.h"
23 #include "ui/gl/gl_bindings.h" 24 #include "ui/gl/gl_bindings.h"
24 #include "ui/gl/gl_version_info.h" 25 #include "ui/gl/gl_version_info.h"
25 26
26 namespace gpu { 27 namespace gpu {
27 namespace gles2 { 28 namespace gles2 {
28 29
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 149
149 buffer_manager_.reset( 150 buffer_manager_.reset(
150 new BufferManager(memory_tracker_.get(), feature_info_.get())); 151 new BufferManager(memory_tracker_.get(), feature_info_.get()));
151 framebuffer_manager_.reset(new FramebufferManager( 152 framebuffer_manager_.reset(new FramebufferManager(
152 max_draw_buffers_, max_color_attachments_, feature_info_->context_type(), 153 max_draw_buffers_, max_color_attachments_, feature_info_->context_type(),
153 framebuffer_completeness_cache_)); 154 framebuffer_completeness_cache_));
154 renderbuffer_manager_.reset(new RenderbufferManager( 155 renderbuffer_manager_.reset(new RenderbufferManager(
155 memory_tracker_.get(), max_renderbuffer_size, max_samples, 156 memory_tracker_.get(), max_renderbuffer_size, max_samples,
156 feature_info_.get())); 157 feature_info_.get()));
157 shader_manager_.reset(new ShaderManager()); 158 shader_manager_.reset(new ShaderManager());
159 sampler_manager_.reset(new SamplerManager(feature_info_.get()));
158 valuebuffer_manager_.reset( 160 valuebuffer_manager_.reset(
159 new ValuebufferManager(subscription_ref_set_.get(), 161 new ValuebufferManager(subscription_ref_set_.get(),
160 pending_valuebuffer_state_.get())); 162 pending_valuebuffer_state_.get()));
161 163
162 // Lookup GL things we need to know. 164 // Lookup GL things we need to know.
163 const GLint kGLES2RequiredMinimumVertexAttribs = 8u; 165 const GLint kGLES2RequiredMinimumVertexAttribs = 8u;
164 if (!QueryGLFeatureU( 166 if (!QueryGLFeatureU(
165 GL_MAX_VERTEX_ATTRIBS, kGLES2RequiredMinimumVertexAttribs, 167 GL_MAX_VERTEX_ATTRIBS, kGLES2RequiredMinimumVertexAttribs,
166 &max_vertex_attribs_)) { 168 &max_vertex_attribs_)) {
167 LOG(ERROR) << "ContextGroup::Initialize failed because too few " 169 LOG(ERROR) << "ContextGroup::Initialize failed because too few "
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 if (program_manager_ != NULL) { 373 if (program_manager_ != NULL) {
372 program_manager_->Destroy(have_context); 374 program_manager_->Destroy(have_context);
373 program_manager_.reset(); 375 program_manager_.reset();
374 } 376 }
375 377
376 if (shader_manager_ != NULL) { 378 if (shader_manager_ != NULL) {
377 shader_manager_->Destroy(have_context); 379 shader_manager_->Destroy(have_context);
378 shader_manager_.reset(); 380 shader_manager_.reset();
379 } 381 }
380 382
383 if (sampler_manager_ != NULL) {
384 sampler_manager_->Destroy(have_context);
385 sampler_manager_.reset();
386 }
387
381 if (valuebuffer_manager_ != NULL) { 388 if (valuebuffer_manager_ != NULL) {
382 valuebuffer_manager_->Destroy(); 389 valuebuffer_manager_->Destroy();
383 valuebuffer_manager_.reset(); 390 valuebuffer_manager_.reset();
384 } 391 }
385 392
386 memory_tracker_ = NULL; 393 memory_tracker_ = NULL;
387 } 394 }
388 395
389 uint32 ContextGroup::GetMemRepresented() const { 396 uint32 ContextGroup::GetMemRepresented() const {
390 uint32 total = 0; 397 uint32 total = 0;
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
448 GLuint client_id, GLuint* service_id) const { 455 GLuint client_id, GLuint* service_id) const {
449 Buffer* buffer = buffer_manager_->GetBuffer(client_id); 456 Buffer* buffer = buffer_manager_->GetBuffer(client_id);
450 if (!buffer) 457 if (!buffer)
451 return false; 458 return false;
452 *service_id = buffer->service_id(); 459 *service_id = buffer->service_id();
453 return true; 460 return true;
454 } 461 }
455 462
456 } // namespace gles2 463 } // namespace gles2
457 } // namespace gpu 464 } // namespace gpu
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/context_group.h ('k') | gpu/command_buffer/service/context_state.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698