| Index: gpu/command_buffer/service/context_group.h
|
| ===================================================================
|
| --- gpu/command_buffer/service/context_group.h (revision 95161)
|
| +++ gpu/command_buffer/service/context_group.h (working copy)
|
| @@ -11,12 +11,13 @@
|
| #include "base/memory/linked_ptr.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "gpu/command_buffer/common/gles2_cmd_format.h"
|
| #include "gpu/command_buffer/service/gles2_cmd_validation.h"
|
| #include "gpu/command_buffer/service/feature_info.h"
|
|
|
| namespace gpu {
|
|
|
| -class IdAllocator;
|
| +class IdAllocatorInterface;
|
|
|
| namespace gles2 {
|
|
|
| @@ -103,7 +104,7 @@
|
| return shader_manager_.get();
|
| }
|
|
|
| - IdAllocator* GetIdAllocator(unsigned namepsace_id);
|
| + IdAllocatorInterface* GetIdAllocator(unsigned namespace_id);
|
|
|
| private:
|
| // Destroys all the resources.
|
| @@ -133,8 +134,8 @@
|
|
|
| scoped_ptr<ShaderManager> shader_manager_;
|
|
|
| - typedef base::hash_map<uint32, linked_ptr<IdAllocator> > IdAllocatorMap;
|
| - IdAllocatorMap id_namespaces_;
|
| + linked_ptr<IdAllocatorInterface>
|
| + id_namespaces_[id_namespaces::kNumIdNamespaces];
|
|
|
| FeatureInfo feature_info_;
|
|
|
|
|