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

gpu/command_buffer/service/query_manager.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/query_manager.h"
 
 #include "base/atomicops.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/shared_memory.h"
 #include "base/numerics/safe_math.h"
 #include "base/synchronization/lock.h"
 #include "base/time/time.h"
 #include "gpu/command_buffer/common/gles2_cmd_format.h"
 #include "gpu/command_buffer/service/async_pixel_transfer_manager.h"
 #include "gpu/command_buffer/service/error_state.h"
 #include "gpu/command_buffer/service/feature_info.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
-#include "ui/gl/gl_context.h"
 #include "ui/gl/gl_fence.h"
-#include "ui/gl/gpu_timing.h"
 
 namespace gpu {
 namespace gles2 {
 
 namespace {
 
 class AsyncPixelTransferCompletionObserverImpl
     : public AsyncPixelTransferCompletionObserver {
  public:
   AsyncPixelTransferCompletionObserverImpl(base::subtle::Atomic32 submit_count)
@@ skipping 411 matching lines @@
 
 void CommandsCompletedQuery::Destroy(bool have_context) {
   if (have_context && !IsDeleted()) {
     fence_.reset();
     MarkAsDeleted();
   }
 }
 
 CommandsCompletedQuery::~CommandsCompletedQuery() {}
 
-class TimeElapsedQuery : public QueryManager::Query {
- public:
-  TimeElapsedQuery(QueryManager* manager,
-                   GLenum target,
-                   int32 shm_id,
-                   uint32 shm_offset);
-
-  // Overridden from QueryManager::Query:
-  bool Begin() override;
-  bool End(base::subtle::Atomic32 submit_count) override;
-  bool Process(bool did_finish) override;
-  void Destroy(bool have_context) override;
-
- protected:
-  ~TimeElapsedQuery() override;
-
- private:
-  scoped_ptr<gfx::GPUTimer> gpu_timer_;
-};
-
-TimeElapsedQuery::TimeElapsedQuery(QueryManager* manager,
-                                   GLenum target,
-                                   int32 shm_id,
-                                   uint32 shm_offset)
-    : Query(manager, target, shm_id, shm_offset),
-      gpu_timer_(manager->CreateGPUTimer(true)) {}
-
-bool TimeElapsedQuery::Begin() {
-  gpu_timer_->Start();
-  return true;
-}
-
-bool TimeElapsedQuery::End(base::subtle::Atomic32 submit_count) {
-  gpu_timer_->End();
-  return AddToPendingQueue(submit_count);
-}
-
-bool TimeElapsedQuery::Process(bool did_finish) {
-  if (!gpu_timer_->IsAvailable())
-    return true;
-
-  const uint64_t nano_seconds =
-      gpu_timer_->GetDeltaElapsed() * base::Time::kNanosecondsPerMicrosecond;
-  return MarkAsCompleted(nano_seconds);
-}
-
-void TimeElapsedQuery::Destroy(bool have_context) {
-  if (gpu_timer_.get()) {
-    gpu_timer_->Destroy(have_context);
-    gpu_timer_.reset();
-  }
-}
-
-TimeElapsedQuery::~TimeElapsedQuery() {}
-
 QueryManager::QueryManager(
     GLES2Decoder* decoder,
     FeatureInfo* feature_info)
     : decoder_(decoder),
       use_arb_occlusion_query2_for_occlusion_query_boolean_(
           feature_info->feature_flags(
             ).use_arb_occlusion_query2_for_occlusion_query_boolean),
       use_arb_occlusion_query_for_occlusion_query_boolean_(
           feature_info->feature_flags(
             ).use_arb_occlusion_query_for_occlusion_query_boolean),
       query_count_(0) {
   DCHECK(!(use_arb_occlusion_query_for_occlusion_query_boolean_ &&
            use_arb_occlusion_query2_for_occlusion_query_boolean_));
-  DCHECK(decoder);
-  gfx::GLContext* context = decoder_->GetGLContext();
-  if (context) {
-    gpu_timing_client_ = context->CreateGPUTimingClient();
-  } else {
-    gpu_timing_client_ = new gfx::GPUTimingClient();
-  }
 }
 
 QueryManager::~QueryManager() {
   DCHECK(queries_.empty());
 
   // If this triggers, that means something is keeping a reference to
   // a Query belonging to this.
   CHECK_EQ(query_count_, 0u);
 }
 
@@ skipping 25 matching lines @@
     case GL_ASYNC_PIXEL_PACK_COMPLETED_CHROMIUM:
       query = new AsyncReadPixelsCompletedQuery(
           this, target, shm_id, shm_offset);
       break;
     case GL_GET_ERROR_QUERY_CHROMIUM:
       query = new GetErrorQuery(this, target, shm_id, shm_offset);
       break;
     case GL_COMMANDS_COMPLETED_CHROMIUM:
       query = new CommandsCompletedQuery(this, target, shm_id, shm_offset);
       break;
-    case GL_TIME_ELAPSED:
-      query = new TimeElapsedQuery(this, target, shm_id, shm_offset);
-      break;
     default: {
       GLuint service_id = 0;
       glGenQueries(1, &service_id);
       DCHECK_NE(0u, service_id);
       query = new AllSamplesPassedQuery(
           this, target, shm_id, shm_offset, service_id);
       break;
     }
   }
   std::pair<QueryMap::iterator, bool> result =
       queries_.insert(std::make_pair(client_id, query));
   DCHECK(result.second);
   return query.get();
 }
 
-scoped_ptr<gfx::GPUTimer> QueryManager::CreateGPUTimer(bool elapsed_time) {
-  return gpu_timing_client_->CreateGPUTimer(elapsed_time);
-}
-
-bool QueryManager::GPUTimingAvailable() {
-  return gpu_timing_client_->IsAvailable();
-}
-
 void QueryManager::GenQueries(GLsizei n, const GLuint* queries) {
   DCHECK_GE(n, 0);
   for (GLsizei i = 0; i < n; ++i) {
     generated_query_ids_.insert(queries[i]);
   }
 }
 
 bool QueryManager::IsValidQuery(GLuint id) {
   GeneratedQueryIds::iterator it = generated_query_ids_.find(id);
   return it != generated_query_ids_.end();
@@ skipping 213 matching lines @@
 bool QueryManager::EndQuery(Query* query, base::subtle::Atomic32 submit_count) {
   DCHECK(query);
   if (!RemovePendingQuery(query)) {
     return false;
   }
   return query->End(submit_count);
 }
 
 }  // namespace gles2
 }  // namespace gpu