| Index: gpu/command_buffer/service/context_group.cc
|
| diff --git a/gpu/command_buffer/service/context_group.cc b/gpu/command_buffer/service/context_group.cc
|
| index cdda09f4adac7d81d58be85134a2eaeface2c890..b90177c9c12fb43fe290e9357e8a173ea941a2ff 100644
|
| --- a/gpu/command_buffer/service/context_group.cc
|
| +++ b/gpu/command_buffer/service/context_group.cc
|
| @@ -16,6 +16,7 @@
|
| #include "gpu/command_buffer/service/path_manager.h"
|
| #include "gpu/command_buffer/service/program_manager.h"
|
| #include "gpu/command_buffer/service/renderbuffer_manager.h"
|
| +#include "gpu/command_buffer/service/sampler_manager.h"
|
| #include "gpu/command_buffer/service/shader_manager.h"
|
| #include "gpu/command_buffer/service/texture_manager.h"
|
| #include "gpu/command_buffer/service/transfer_buffer_manager.h"
|
| @@ -155,6 +156,7 @@ bool ContextGroup::Initialize(GLES2Decoder* decoder,
|
| memory_tracker_.get(), max_renderbuffer_size, max_samples,
|
| feature_info_.get()));
|
| shader_manager_.reset(new ShaderManager());
|
| + sampler_manager_.reset(new SamplerManager(feature_info_.get()));
|
| valuebuffer_manager_.reset(
|
| new ValuebufferManager(subscription_ref_set_.get(),
|
| pending_valuebuffer_state_.get()));
|
| @@ -378,6 +380,11 @@ void ContextGroup::Destroy(GLES2Decoder* decoder, bool have_context) {
|
| shader_manager_.reset();
|
| }
|
|
|
| + if (sampler_manager_ != NULL) {
|
| + sampler_manager_->Destroy(have_context);
|
| + sampler_manager_.reset();
|
| + }
|
| +
|
| if (valuebuffer_manager_ != NULL) {
|
| valuebuffer_manager_->Destroy();
|
| valuebuffer_manager_.reset();
|
|
|