| OLD | NEW |
| 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 #ifndef GPU_COMMAND_BUFFER_CLIENT_SHARE_GROUP_H_ | 5 #ifndef GPU_COMMAND_BUFFER_CLIENT_SHARE_GROUP_H_ |
| 6 #define GPU_COMMAND_BUFFER_CLIENT_SHARE_GROUP_H_ | 6 #define GPU_COMMAND_BUFFER_CLIENT_SHARE_GROUP_H_ |
| 7 | 7 |
| 8 #include <GLES2/gl2.h> | 8 #include <GLES2/gl2.h> |
| 9 #include <stdint.h> | 9 #include <stdint.h> |
| 10 |
| 11 #include <memory> |
| 12 |
| 10 #include "base/macros.h" | 13 #include "base/macros.h" |
| 11 #include "base/memory/scoped_ptr.h" | |
| 12 #include "gles2_impl_export.h" | 14 #include "gles2_impl_export.h" |
| 13 #include "gpu/command_buffer/client/ref_counted.h" | 15 #include "gpu/command_buffer/client/ref_counted.h" |
| 14 #include "gpu/command_buffer/common/gles2_cmd_format.h" | 16 #include "gpu/command_buffer/common/gles2_cmd_format.h" |
| 15 | 17 |
| 16 namespace gpu { | 18 namespace gpu { |
| 17 namespace gles2 { | 19 namespace gles2 { |
| 18 | 20 |
| 19 class GLES2Implementation; | 21 class GLES2Implementation; |
| 20 class GLES2ImplementationTest; | 22 class GLES2ImplementationTest; |
| 21 class ProgramInfoManager; | 23 class ProgramInfoManager; |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 145 uint64_t TracingGUID() const { return tracing_guid_; } | 147 uint64_t TracingGUID() const { return tracing_guid_; } |
| 146 | 148 |
| 147 private: | 149 private: |
| 148 friend class gpu::RefCountedThreadSafe<ShareGroup>; | 150 friend class gpu::RefCountedThreadSafe<ShareGroup>; |
| 149 friend class gpu::gles2::GLES2ImplementationTest; | 151 friend class gpu::gles2::GLES2ImplementationTest; |
| 150 ~ShareGroup(); | 152 ~ShareGroup(); |
| 151 | 153 |
| 152 // Install a new program info manager. Used for testing only; | 154 // Install a new program info manager. Used for testing only; |
| 153 void set_program_info_manager(ProgramInfoManager* manager); | 155 void set_program_info_manager(ProgramInfoManager* manager); |
| 154 | 156 |
| 155 scoped_ptr<IdHandlerInterface> id_handlers_[id_namespaces::kNumIdNamespaces]; | 157 std::unique_ptr<IdHandlerInterface> |
| 156 scoped_ptr<RangeIdHandlerInterface> | 158 id_handlers_[id_namespaces::kNumIdNamespaces]; |
| 159 std::unique_ptr<RangeIdHandlerInterface> |
| 157 range_id_handlers_[id_namespaces::kNumRangeIdNamespaces]; | 160 range_id_handlers_[id_namespaces::kNumRangeIdNamespaces]; |
| 158 scoped_ptr<ProgramInfoManager> program_info_manager_; | 161 std::unique_ptr<ProgramInfoManager> program_info_manager_; |
| 159 | 162 |
| 160 bool bind_generates_resource_; | 163 bool bind_generates_resource_; |
| 161 uint64_t tracing_guid_; | 164 uint64_t tracing_guid_; |
| 162 | 165 |
| 163 DISALLOW_COPY_AND_ASSIGN(ShareGroup); | 166 DISALLOW_COPY_AND_ASSIGN(ShareGroup); |
| 164 }; | 167 }; |
| 165 | 168 |
| 166 } // namespace gles2 | 169 } // namespace gles2 |
| 167 } // namespace gpu | 170 } // namespace gpu |
| 168 | 171 |
| 169 #endif // GPU_COMMAND_BUFFER_CLIENT_SHARE_GROUP_H_ | 172 #endif // GPU_COMMAND_BUFFER_CLIENT_SHARE_GROUP_H_ |
| OLD | NEW |