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_GLES2_IMPLEMENTATION_H_ | 5 #ifndef GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_H_ |
6 #define GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_H_ | 6 #define GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_H_ |
7 | 7 |
8 #include <GLES2/gl2.h> | 8 #include <GLES2/gl2.h> |
9 | 9 |
10 #include <list> | 10 #include <list> |
(...skipping 693 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
704 | 704 |
705 scoped_ptr<QueryTracker> query_tracker_; | 705 scoped_ptr<QueryTracker> query_tracker_; |
706 typedef std::map<GLuint, QueryTracker::Query*> QueryMap; | 706 typedef std::map<GLuint, QueryTracker::Query*> QueryMap; |
707 QueryMap current_queries_; | 707 QueryMap current_queries_; |
708 scoped_ptr<IdAllocator> query_id_allocator_; | 708 scoped_ptr<IdAllocator> query_id_allocator_; |
709 | 709 |
710 scoped_ptr<BufferTracker> buffer_tracker_; | 710 scoped_ptr<BufferTracker> buffer_tracker_; |
711 | 711 |
712 GLES2ImplementationErrorMessageCallback* error_message_callback_; | 712 GLES2ImplementationErrorMessageCallback* error_message_callback_; |
713 | 713 |
| 714 scoped_ptr<std::string> current_trace_category_; |
714 scoped_ptr<std::string> current_trace_name_; | 715 scoped_ptr<std::string> current_trace_name_; |
715 | 716 |
716 GpuControl* gpu_control_; | 717 GpuControl* gpu_control_; |
717 | 718 |
718 Capabilities capabilities_; | 719 Capabilities capabilities_; |
719 | 720 |
720 base::WeakPtrFactory<GLES2Implementation> weak_ptr_factory_; | 721 base::WeakPtrFactory<GLES2Implementation> weak_ptr_factory_; |
721 | 722 |
722 DISALLOW_COPY_AND_ASSIGN(GLES2Implementation); | 723 DISALLOW_COPY_AND_ASSIGN(GLES2Implementation); |
723 }; | 724 }; |
(...skipping 28 matching lines...) Expand all Loading... |
752 | 753 |
753 inline bool GLES2Implementation::GetTexParameterivHelper( | 754 inline bool GLES2Implementation::GetTexParameterivHelper( |
754 GLenum /* target */, GLenum /* pname */, GLint* /* params */) { | 755 GLenum /* target */, GLenum /* pname */, GLint* /* params */) { |
755 return false; | 756 return false; |
756 } | 757 } |
757 | 758 |
758 } // namespace gles2 | 759 } // namespace gles2 |
759 } // namespace gpu | 760 } // namespace gpu |
760 | 761 |
761 #endif // GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_H_ | 762 #endif // GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_H_ |
OLD | NEW |