Added support for Time Elapsed queries through the command buffer.

gpu/command_buffer/service/gles2_cmd_decoder.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 
 #include <stdio.h>
 
 #include <algorithm>
 #include <cmath>
@@ skipping 11573 matching lines @@
     case GL_GET_ERROR_QUERY_CHROMIUM:
       break;
     case GL_COMMANDS_COMPLETED_CHROMIUM:
       if (!features().chromium_sync_query) {
         LOCAL_SET_GL_ERROR(
             GL_INVALID_OPERATION, "glBeginQueryEXT",
             "not enabled for commands completed queries");
         return error::kNoError;
       }
       break;
-    default:
+    case GL_SAMPLES_PASSED:

[no sievers, 2015/06/23 21:45:27]

Good catch. Also, GL_SAMPLES_PASSED is actually not from
occlusion_query_boolean.

[David Yen, 2015/06/23 23:35:32]

We worked this out together, this should be okay.

+    case GL_ANY_SAMPLES_PASSED:
+    case GL_ANY_SAMPLES_PASSED_CONSERVATIVE:

[no sievers, 2015/06/23 21:45:27]

@bajones: Do we support GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN yet w/the
experimental webgl2 stuff?
If we do looks like that would somehow oddly slip through the
AllSamplesPassedQuery in query_manager.cc.

[David Yen, 2015/06/23 23:35:32]

I talked this over with bajones, we do not support that query target.

       if (!features().occlusion_query_boolean) {
         LOCAL_SET_GL_ERROR(
             GL_INVALID_OPERATION, "glBeginQueryEXT",
             "not enabled for occlusion queries");
         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()) {
     LOCAL_SET_GL_ERROR(
         GL_INVALID_OPERATION, "glBeginQueryEXT", "query already in progress");
     return error::kNoError;
   }
 
   if (client_id == 0) {
     LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, "glBeginQueryEXT", "id is 0");
@@ skipping 2091 matching lines @@
   }
 }
 
 // Include the auto-generated part of this file. We split this because it means
 // we can easily edit the non-auto generated parts right here in this file
 // instead of having to edit some template or the code generator.
 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu