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

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: One more tweak from zmo@'s feedback 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
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 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 143
143 buffer_manager_.reset( 144 buffer_manager_.reset(
144 new BufferManager(memory_tracker_.get(), feature_info_.get())); 145 new BufferManager(memory_tracker_.get(), feature_info_.get()));
145 framebuffer_manager_.reset(new FramebufferManager( 146 framebuffer_manager_.reset(new FramebufferManager(
146 max_draw_buffers_, max_color_attachments_, feature_info_->context_type(), 147 max_draw_buffers_, max_color_attachments_, feature_info_->context_type(),
147 framebuffer_completeness_cache_)); 148 framebuffer_completeness_cache_));
148 renderbuffer_manager_.reset(new RenderbufferManager( 149 renderbuffer_manager_.reset(new RenderbufferManager(
149 memory_tracker_.get(), max_renderbuffer_size, max_samples, 150 memory_tracker_.get(), max_renderbuffer_size, max_samples,
150 feature_info_.get())); 151 feature_info_.get()));
151 shader_manager_.reset(new ShaderManager()); 152 shader_manager_.reset(new ShaderManager());
153 sampler_manager_.reset(new SamplerManager(feature_info_.get()));
152 valuebuffer_manager_.reset( 154 valuebuffer_manager_.reset(
153 new ValuebufferManager(subscription_ref_set_.get(), 155 new ValuebufferManager(subscription_ref_set_.get(),
154 pending_valuebuffer_state_.get())); 156 pending_valuebuffer_state_.get()));
155 157
156 // Lookup GL things we need to know. 158 // Lookup GL things we need to know.
157 const GLint kGLES2RequiredMinimumVertexAttribs = 8u; 159 const GLint kGLES2RequiredMinimumVertexAttribs = 8u;
158 if (!QueryGLFeatureU( 160 if (!QueryGLFeatureU(
159 GL_MAX_VERTEX_ATTRIBS, kGLES2RequiredMinimumVertexAttribs, 161 GL_MAX_VERTEX_ATTRIBS, kGLES2RequiredMinimumVertexAttribs,
160 &max_vertex_attribs_)) { 162 &max_vertex_attribs_)) {
161 LOG(ERROR) << "ContextGroup::Initialize failed because too few " 163 LOG(ERROR) << "ContextGroup::Initialize failed because too few "
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 if (program_manager_ != NULL) { 366 if (program_manager_ != NULL) {
365 program_manager_->Destroy(have_context); 367 program_manager_->Destroy(have_context);
366 program_manager_.reset(); 368 program_manager_.reset();
367 } 369 }
368 370
369 if (shader_manager_ != NULL) { 371 if (shader_manager_ != NULL) {
370 shader_manager_->Destroy(have_context); 372 shader_manager_->Destroy(have_context);
371 shader_manager_.reset(); 373 shader_manager_.reset();
372 } 374 }
373 375
376 if (sampler_manager_ != NULL) {
377 sampler_manager_->Destroy(have_context);
378 sampler_manager_.reset();
379 }
380
374 if (valuebuffer_manager_ != NULL) { 381 if (valuebuffer_manager_ != NULL) {
375 valuebuffer_manager_->Destroy(); 382 valuebuffer_manager_->Destroy();
376 valuebuffer_manager_.reset(); 383 valuebuffer_manager_.reset();
377 } 384 }
378 385
379 memory_tracker_ = NULL; 386 memory_tracker_ = NULL;
380 } 387 }
381 388
382 uint32 ContextGroup::GetMemRepresented() const { 389 uint32 ContextGroup::GetMemRepresented() const {
383 uint32 total = 0; 390 uint32 total = 0;
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
441 GLuint client_id, GLuint* service_id) const { 448 GLuint client_id, GLuint* service_id) const {
442 Buffer* buffer = buffer_manager_->GetBuffer(client_id); 449 Buffer* buffer = buffer_manager_->GetBuffer(client_id);
443 if (!buffer) 450 if (!buffer)
444 return false; 451 return false;
445 *service_id = buffer->service_id(); 452 *service_id = buffer->service_id();
446 return true; 453 return true;
447 } 454 }
448 455
449 } // namespace gles2 456 } // namespace gles2
450 } // namespace gpu 457 } // namespace gpu
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698