| 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()) {
|
|
|