Revert of Added support for Time Elapsed queries through the command buffer.

gpu/command_buffer/client/gles2_implementation.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.
 
 // A class to emulate GLES2 over command buffers.
 
 #include "gpu/command_buffer/client/gles2_implementation.h"
 
 #include <GLES2/gl2ext.h>
 #include <GLES2/gl2extchromium.h>
@@ skipping 689 matching lines @@
       return true;
     case GL_PIXEL_UNPACK_TRANSFER_BUFFER_BINDING_CHROMIUM:
       *params = bound_pixel_unpack_transfer_buffer_id_;
       return true;
     case GL_READ_FRAMEBUFFER_BINDING:
       if (IsChromiumFramebufferMultisampleAvailable()) {
         *params = bound_read_framebuffer_;
         return true;
       }
       break;
-    case GL_TIMESTAMP_EXT:
-      // We convert all GPU timestamps to CPU time.
-      *params = base::saturated_cast<GLint>(
-          (base::TraceTicks::Now() - base::TraceTicks()).InMicroseconds()
-          * base::Time::kNanosecondsPerMicrosecond);
-      return true;
 
     // Non-cached parameters.
     case GL_ALIASED_LINE_WIDTH_RANGE:
     case GL_ALIASED_POINT_SIZE_RANGE:
     case GL_ALPHA_BITS:
     case GL_BLEND:
     case GL_BLEND_COLOR:
     case GL_BLEND_DST_ALPHA:
     case GL_BLEND_DST_RGB:
     case GL_BLEND_EQUATION_ALPHA:
@@ skipping 270 matching lines @@
       return true;
     case GL_MAX_ELEMENT_INDEX:
       *params = capabilities_.max_element_index;
       return true;
     case GL_MAX_SERVER_WAIT_TIMEOUT:
       *params = capabilities_.max_server_wait_timeout;
       return true;
     case GL_MAX_UNIFORM_BLOCK_SIZE:
       *params = capabilities_.max_uniform_block_size;
       return true;
-    case GL_TIMESTAMP_EXT:
-      // We convert all GPU timestamps to CPU time.
-      *params = (base::TraceTicks::Now() - base::TraceTicks()).InMicroseconds()
-                * base::Time::kNanosecondsPerMicrosecond;
-      return true;
     default:
       break;
   }
   GLint value;
   if (!GetHelper(pname, &value)) {
     return false;
   }
   *params = static_cast<GLint64>(value);
   return true;
 }
@@ skipping 41 matching lines @@
   if (bufsize > 0) {
     DCHECK(values);
     *values = value;
   }
   if (length) {
     *length = 1;
   }
   return true;
 }
 
-bool GLES2Implementation::GetQueryObjectValueHelper(
-    const char* function_name, GLuint id, GLenum pname, GLuint64* params) {
-  GPU_CLIENT_SINGLE_THREAD_CHECK();
-  GPU_CLIENT_LOG("[" << GetLogPrefix() << "] GetQueryObjectValueHelper("
-                 << id << ", "
-                 << GLES2Util::GetStringQueryObjectParameter(pname) << ", "
-                 << static_cast<const void*>(params) << ")");
-
-  QueryTracker::Query* query = query_tracker_->GetQuery(id);
-  if (!query) {
-    SetGLError(GL_INVALID_OPERATION,
-               function_name, "unknown query id");
-    return false;
-  }
-
-  if (query->Active()) {
-    SetGLError(
-        GL_INVALID_OPERATION,
-        function_name,
-        "query active. Did you to call glEndQueryEXT?");
-    return false;
-  }
-
-  if (query->NeverUsed()) {
-    SetGLError(
-        GL_INVALID_OPERATION,
-        function_name, "Never used. Did you call glBeginQueryEXT?");
-    return false;
-  }
-
-  bool valid_value = false;
-  switch (pname) {
-    case GL_QUERY_RESULT_EXT:
-      if (!query->CheckResultsAvailable(helper_)) {
-        helper_->WaitForToken(query->token());
-        if (!query->CheckResultsAvailable(helper_)) {
-          FinishHelper();
-          CHECK(query->CheckResultsAvailable(helper_));
-        }
-      }
-      *params = query->GetResult();
-      valid_value = true;
-      break;
-    case GL_QUERY_RESULT_AVAILABLE_EXT:
-      *params = query->CheckResultsAvailable(helper_);
-      valid_value = true;
-      break;
-    default:
-      SetGLErrorInvalidEnum(function_name, pname, "pname");
-      break;
-  }
-  GPU_CLIENT_LOG("  " << *params);
-  CheckGLError();
-  return valid_value;
-}
-
 GLuint GLES2Implementation::GetMaxValueInBufferCHROMIUMHelper(
     GLuint buffer_id, GLsizei count, GLenum type, GLuint offset) {
   typedef cmds::GetMaxValueInBufferCHROMIUM::Result Result;
   Result* result = GetResultAs<Result*>();
   if (!result) {
     return 0;
   }
   *result = 0;
   helper_->GetMaxValueInBufferCHROMIUM(
       buffer_id, count, type, offset, GetResultShmId(), GetResultShmOffset());
@@ skipping 3749 matching lines @@
     CheckGLError();
 }
 
 void GLES2Implementation::GetQueryivEXT(
     GLenum target, GLenum pname, GLint* params) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] GetQueryivEXT("
                  << GLES2Util::GetStringQueryTarget(target) << ", "
                  << GLES2Util::GetStringQueryParameter(pname) << ", "
                  << static_cast<const void*>(params) << ")");
-  if (pname == GL_QUERY_COUNTER_BITS_EXT) {
-    // We convert all queries to CPU time so we support 64 bits.
-    *params = 64;
-    return;
-  } else if (pname != GL_CURRENT_QUERY_EXT) {
+
+  if (pname != GL_CURRENT_QUERY_EXT) {
     SetGLErrorInvalidEnum("glGetQueryivEXT", pname, "pname");
     return;
   }
   QueryTracker::Query* query = query_tracker_->GetCurrentQuery(target);
   *params = query ? query->id() : 0;
   GPU_CLIENT_LOG("  " << *params);
   CheckGLError();
 }
 
 void GLES2Implementation::GetQueryObjectuivEXT(
     GLuint id, GLenum pname, GLuint* params) {
-  GLuint64 result = 0;
-  if (GetQueryObjectValueHelper("glQueryObjectuivEXT", id, pname, &result))
-    *params = base::saturated_cast<GLuint>(result);
-}
+  GPU_CLIENT_SINGLE_THREAD_CHECK();
+  GPU_CLIENT_LOG("[" << GetLogPrefix() << "] GetQueryivEXT(" << id << ", "
+                 << GLES2Util::GetStringQueryObjectParameter(pname) << ", "
+                 << static_cast<const void*>(params) << ")");
 
-void GLES2Implementation::GetQueryObjectui64vEXT(
-    GLuint id, GLenum pname, GLuint64* params) {
-  GLuint64 result = 0;
-  if (GetQueryObjectValueHelper("glQueryObjectui64vEXT", id, pname, &result))
-    *params = result;
+  QueryTracker::Query* query = query_tracker_->GetQuery(id);
+  if (!query) {
+    SetGLError(GL_INVALID_OPERATION, "glQueryObjectuivEXT", "unknown query id");
+    return;
+  }
+
+  if (query->Active()) {
+    SetGLError(
+        GL_INVALID_OPERATION,
+        "glQueryObjectuivEXT", "query active. Did you to call glEndQueryEXT?");
+    return;
+  }
+
+  if (query->NeverUsed()) {
+    SetGLError(
+        GL_INVALID_OPERATION,
+        "glQueryObjectuivEXT", "Never used. Did you call glBeginQueryEXT?");
+    return;
+  }
+
+  switch (pname) {
+    case GL_QUERY_RESULT_EXT:
+      if (!query->CheckResultsAvailable(helper_)) {
+        helper_->WaitForToken(query->token());
+        if (!query->CheckResultsAvailable(helper_)) {
+          FinishHelper();
+          CHECK(query->CheckResultsAvailable(helper_));
+        }
+      }
+      *params = query->GetResult();
+      break;
+    case GL_QUERY_RESULT_AVAILABLE_EXT:
+      *params = query->CheckResultsAvailable(helper_);
+      break;
+    default:
+      SetGLErrorInvalidEnum("glQueryObjectuivEXT", pname, "pname");
+      break;
+  }
+  GPU_CLIENT_LOG("  " << *params);
+  CheckGLError();
 }
 
 void GLES2Implementation::DrawArraysInstancedANGLE(
     GLenum mode, GLint first, GLsizei count, GLsizei primcount) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glDrawArraysInstancedANGLE("
       << GLES2Util::GetStringDrawMode(mode) << ", "
       << first << ", " << count << ", " << primcount << ")");
   if (count < 0) {
     SetGLError(GL_INVALID_VALUE, "glDrawArraysInstancedANGLE", "count < 0");
@@ skipping 851 matching lines @@
   CheckGLError();
 }
 
 // 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/client/gles2_implementation_impl_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu