Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(12)

Side by Side Diff: gpu/command_buffer/client/gles2_implementation.h

Issue 776603003: Changed the GPU Tracer so the category names can be customized. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Service side GPU trace not turned on when device is turned on Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 699 matching lines...) Expand 10 before | Expand all | Expand 10 after
710 710
711 scoped_ptr<QueryTracker> query_tracker_; 711 scoped_ptr<QueryTracker> query_tracker_;
712 typedef std::map<GLuint, QueryTracker::Query*> QueryMap; 712 typedef std::map<GLuint, QueryTracker::Query*> QueryMap;
713 QueryMap current_queries_; 713 QueryMap current_queries_;
714 scoped_ptr<IdAllocator> query_id_allocator_; 714 scoped_ptr<IdAllocator> query_id_allocator_;
715 715
716 scoped_ptr<BufferTracker> buffer_tracker_; 716 scoped_ptr<BufferTracker> buffer_tracker_;
717 717
718 GLES2ImplementationErrorMessageCallback* error_message_callback_; 718 GLES2ImplementationErrorMessageCallback* error_message_callback_;
719 719
720 scoped_ptr<std::string> current_trace_category_;
720 scoped_ptr<std::string> current_trace_name_; 721 scoped_ptr<std::string> current_trace_name_;
721 722
722 GpuControl* gpu_control_; 723 GpuControl* gpu_control_;
723 724
724 Capabilities capabilities_; 725 Capabilities capabilities_;
725 726
726 base::WeakPtrFactory<GLES2Implementation> weak_ptr_factory_; 727 base::WeakPtrFactory<GLES2Implementation> weak_ptr_factory_;
727 728
728 DISALLOW_COPY_AND_ASSIGN(GLES2Implementation); 729 DISALLOW_COPY_AND_ASSIGN(GLES2Implementation);
729 }; 730 };
(...skipping 28 matching lines...) Expand all
758 759
759 inline bool GLES2Implementation::GetTexParameterivHelper( 760 inline bool GLES2Implementation::GetTexParameterivHelper(
760 GLenum /* target */, GLenum /* pname */, GLint* /* params */) { 761 GLenum /* target */, GLenum /* pname */, GLint* /* params */) {
761 return false; 762 return false;
762 } 763 }
763 764
764 } // namespace gles2 765 } // namespace gles2
765 } // namespace gpu 766 } // namespace gpu
766 767
767 #endif // GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_H_ 768 #endif // GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_H_
OLDNEW
« no previous file with comments | « gpu/command_buffer/client/gles2_cmd_helper_autogen.h ('k') | gpu/command_buffer/client/gles2_implementation.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698