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

Unified Diff: gpu/command_buffer/service/query_manager.h

Issue 10577037: Add GL_CHROMIUM_get_error_query (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder_mock.h ('k') | gpu/command_buffer/service/query_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/query_manager.h
diff --git a/gpu/command_buffer/service/query_manager.h b/gpu/command_buffer/service/query_manager.h
index 7e3f38dc0d17d3d36cab76d6bebe874f82c94639..f6d3942a0d66daedce48fc537038466b4b880549 100644
--- a/gpu/command_buffer/service/query_manager.h
+++ b/gpu/command_buffer/service/query_manager.h
@@ -17,7 +17,7 @@
namespace gpu {
-class CommonDecoder;
+class GLES2Decoder;
namespace gles2 {
@@ -132,7 +132,7 @@ class GPU_EXPORT QueryManager {
};
QueryManager(
- CommonDecoder* decoder,
+ GLES2Decoder* decoder,
FeatureInfo* feature_info);
~QueryManager();
@@ -162,6 +162,10 @@ class GPU_EXPORT QueryManager {
// True if there are pending queries.
bool HavePendingQueries();
+ GLES2Decoder* decoder() const {
+ return decoder_;
+ }
+
private:
void StartTracking(Query* query);
void StopTracking(Query* query);
@@ -183,8 +187,8 @@ class GPU_EXPORT QueryManager {
// used to emulate a query.
GLenum AdjustTargetForEmulation(GLenum target);
- // Used to validate shared memory.
- CommonDecoder* decoder_;
+ // Used to validate shared memory and get GL errors.
+ GLES2Decoder* decoder_;
bool use_arb_occlusion_query2_for_occlusion_query_boolean_;
bool use_arb_occlusion_query_for_occlusion_query_boolean_;
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder_mock.h ('k') | gpu/command_buffer/service/query_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698