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

Unified Diff: gpu/command_buffer/service/gles2_cmd_decoder.cc

Issue 1222563003: Revert of Added support for Time Elapsed queries through the command buffer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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
Index: gpu/command_buffer/service/gles2_cmd_decoder.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index 0a09caada12553998569f26a0ebf9b9a1d3e7fd1..733f330a55aa278e4de58d44ed77e6ba7c61802a 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -11563,9 +11563,7 @@
return error::kNoError;
}
break;
- case GL_SAMPLES_PASSED:
- case GL_ANY_SAMPLES_PASSED:
- case GL_ANY_SAMPLES_PASSED_CONSERVATIVE:
+ default:
if (!features().occlusion_query_boolean) {
LOCAL_SET_GL_ERROR(
GL_INVALID_OPERATION, "glBeginQueryEXT",
@@ -11573,19 +11571,6 @@
return error::kNoError;
}
break;
- case GL_TIME_ELAPSED:
- if (!query_manager_->GPUTimingAvailable()) {
- LOCAL_SET_GL_ERROR(
- GL_INVALID_OPERATION, "glBeginQueryEXT",
- "not enabled for timing queries");
- return error::kNoError;
- }
- break;
- default:
- LOCAL_SET_GL_ERROR(
- GL_INVALID_OPERATION, "glBeginQueryEXT",
- "unknown query target");
- return error::kNoError;
}
if (state_.current_queries.find(target) != state_.current_queries.end()) {
« no previous file with comments | « gpu/command_buffer/cmd_buffer_functions.txt ('k') | gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698