| 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 001b43c9d4db5e874113a5547e93ed75d3f41d29..40fdcf7f9d0b8d000e95cdc96dfa45733cad6638 100644
|
| --- a/gpu/command_buffer/service/context_group.cc
|
| +++ b/gpu/command_buffer/service/context_group.cc
|
| @@ -11,7 +11,6 @@
|
| #include <string>
|
|
|
| #include "base/command_line.h"
|
| -#include "gpu/command_buffer/common/value_state.h"
|
| #include "gpu/command_buffer/service/buffer_manager.h"
|
| #include "gpu/command_buffer/service/framebuffer_manager.h"
|
| #include "gpu/command_buffer/service/gpu_preferences.h"
|
| @@ -23,7 +22,6 @@
|
| #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"
|
| -#include "gpu/command_buffer/service/valuebuffer_manager.h"
|
| #include "ui/gl/gl_bindings.h"
|
| #include "ui/gl/gl_version_info.h"
|
|
|
| @@ -65,8 +63,6 @@ ContextGroup::ContextGroup(
|
| const scoped_refptr<FramebufferCompletenessCache>&
|
| framebuffer_completeness_cache,
|
| const scoped_refptr<FeatureInfo>& feature_info,
|
| - const scoped_refptr<SubscriptionRefSet>& subscription_ref_set,
|
| - const scoped_refptr<ValueStateMap>& pending_valuebuffer_state,
|
| bool bind_generates_resource)
|
| : gpu_preferences_(gpu_preferences),
|
| mailbox_manager_(mailbox_manager),
|
| @@ -83,8 +79,6 @@ ContextGroup::ContextGroup(
|
| #else
|
| framebuffer_completeness_cache_(framebuffer_completeness_cache),
|
| #endif
|
| - subscription_ref_set_(subscription_ref_set),
|
| - pending_valuebuffer_state_(pending_valuebuffer_state),
|
| enforce_gl_minimums_(gpu_preferences_.enforce_gl_minimums),
|
| bind_generates_resource_(bind_generates_resource),
|
| max_vertex_attribs_(0u),
|
| @@ -107,10 +101,6 @@ ContextGroup::ContextGroup(
|
| DCHECK(feature_info_);
|
| if (!mailbox_manager_.get())
|
| mailbox_manager_ = new MailboxManagerImpl;
|
| - if (!subscription_ref_set_.get())
|
| - subscription_ref_set_ = new SubscriptionRefSet();
|
| - if (!pending_valuebuffer_state_.get())
|
| - pending_valuebuffer_state_ = new ValueStateMap();
|
| transfer_buffer_manager_ = new TransferBufferManager(memory_tracker_.get());
|
| }
|
| }
|
| @@ -185,9 +175,6 @@ bool ContextGroup::Initialize(GLES2Decoder* decoder,
|
| 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()));
|
|
|
| // Lookup GL things we need to know.
|
| const GLint kGLES2RequiredMinimumVertexAttribs = 8u;
|
| @@ -494,11 +481,6 @@ void ContextGroup::Destroy(GLES2Decoder* decoder, bool have_context) {
|
| sampler_manager_.reset();
|
| }
|
|
|
| - if (valuebuffer_manager_ != NULL) {
|
| - valuebuffer_manager_->Destroy();
|
| - valuebuffer_manager_.reset();
|
| - }
|
| -
|
| memory_tracker_ = NULL;
|
| }
|
|
|
|
|