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

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

Issue 10836185: Implement GL_EXT_debug_marker (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 months 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 | Annotate | Revision Log
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 <map> 10 #include <map>
11 #include <queue> 11 #include <queue>
12 #include <set> 12 #include <set>
13 #include <string> 13 #include <string>
14 #include <vector> 14 #include <vector>
15 15
16 #include "../common/debug_marker_manager.h"
16 #include "../common/gles2_cmd_utils.h" 17 #include "../common/gles2_cmd_utils.h"
17 #include "../common/scoped_ptr.h" 18 #include "../common/scoped_ptr.h"
18 #include "../client/ref_counted.h" 19 #include "../client/ref_counted.h"
19 #include "../client/gles2_cmd_helper.h" 20 #include "../client/gles2_cmd_helper.h"
20 #include "../client/query_tracker.h" 21 #include "../client/query_tracker.h"
21 #include "../client/ring_buffer.h" 22 #include "../client/ring_buffer.h"
22 #include "../client/share_group.h" 23 #include "../client/share_group.h"
23 #include "gles2_impl_export.h" 24 #include "gles2_impl_export.h"
24 25
25 #if !defined(NDEBUG) && !defined(__native_client__) && !defined(GLES2_CONFORMANC E_TESTS) // NOLINT 26 #if !defined(NDEBUG) && !defined(__native_client__) && !defined(GLES2_CONFORMANC E_TESTS) // NOLINT
(...skipping 449 matching lines...) Expand 10 before | Expand all | Expand 10 after
475 476
476 IdHandlerInterface* GetIdHandler(int id_namespace) const; 477 IdHandlerInterface* GetIdHandler(int id_namespace) const;
477 478
478 void FinishHelper(); 479 void FinishHelper();
479 480
480 // Checks if the context is lost. 481 // Checks if the context is lost.
481 // NOTE: This is an expensive call and should only be called 482 // NOTE: This is an expensive call and should only be called
482 // for error checking. 483 // for error checking.
483 bool MustBeContextLost(); 484 bool MustBeContextLost();
484 485
486 const std::string& GetLogPrefix() const;
487
485 GLES2Util util_; 488 GLES2Util util_;
486 GLES2CmdHelper* helper_; 489 GLES2CmdHelper* helper_;
487 TransferBufferInterface* transfer_buffer_; 490 TransferBufferInterface* transfer_buffer_;
488 std::string last_error_; 491 std::string last_error_;
492 DebugMarkerManager debug_marker_manager_;
493 std::string this_in_hex_;
489 494
490 std::queue<int32> swap_buffers_tokens_; 495 std::queue<int32> swap_buffers_tokens_;
491 std::queue<int32> rate_limit_tokens_; 496 std::queue<int32> rate_limit_tokens_;
492 497
493 ExtensionStatus angle_pack_reverse_row_order_status; 498 ExtensionStatus angle_pack_reverse_row_order_status;
494 499
495 GLCachedState gl_state_; 500 GLCachedState gl_state_;
496 501
497 // pack alignment as last set by glPixelStorei 502 // pack alignment as last set by glPixelStorei
498 GLint pack_alignment_; 503 GLint pack_alignment_;
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
607 612
608 inline bool GLES2Implementation::GetTexParameterivHelper( 613 inline bool GLES2Implementation::GetTexParameterivHelper(
609 GLenum /* target */, GLenum /* pname */, GLint* /* params */) { 614 GLenum /* target */, GLenum /* pname */, GLint* /* params */) {
610 return false; 615 return false;
611 } 616 }
612 617
613 } // namespace gles2 618 } // namespace gles2
614 } // namespace gpu 619 } // namespace gpu
615 620
616 #endif // GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_H_ 621 #endif // GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698