Re-land: gpu: Add CHROMIUM_sync_query extension.

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"
@@ skipping 371 matching lines @@
 
 void GetErrorQuery::Destroy(bool /* have_context */) {
   if (!IsDeleted()) {
     MarkAsDeleted();
   }
 }
 
 GetErrorQuery::~GetErrorQuery() {
 }
 
+class CommandsCompletedQuery : public QueryManager::Query {
+ public:
+  CommandsCompletedQuery(QueryManager* manager,
+                         GLenum target,
+                         int32 shm_id,
+                         uint32 shm_offset,
+                         bool use_arb_sync);
+
+  // Overridden from QueryManager::Query:
+  virtual bool Begin() OVERRIDE;
+  virtual bool End(base::subtle::Atomic32 submit_count) OVERRIDE;
+  virtual bool Process() OVERRIDE;
+  virtual void Destroy(bool have_context) OVERRIDE;
+
+ protected:
+  virtual ~CommandsCompletedQuery();
+
+ private:
+  bool use_arb_sync_;
+  GLsync sync_;
+};
+
+CommandsCompletedQuery::CommandsCompletedQuery(QueryManager* manager,
+                                               GLenum target,
+                                               int32 shm_id,
+                                               uint32 shm_offset,
+                                               bool use_arb_sync)
+    : Query(manager, target, shm_id, shm_offset),
+      use_arb_sync_(use_arb_sync),
+      sync_(NULL) {}
+
+bool CommandsCompletedQuery::Begin() {
+  if (sync_) {
+    glDeleteSync(sync_);
+    sync_ = NULL;
+  }
+  return true;
+}
+
+bool CommandsCompletedQuery::End(base::subtle::Atomic32 submit_count) {
+  if (use_arb_sync_) {
+    sync_ = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);

[no sievers, 2014/04/15 18:41:15]

You have to glFlush() somewhere or the commands might never complete.

Can you just use the GLFence class here?

[no sievers, 2014/04/15 18:48:44]

"Querying the GL_QUERY_RESULT implicitly flushes the GL pipeline". So we could
also defer it, if that's not already happening somewhere on the service-side.
That would make it more efficient for clients that insert a lot of these queries
per frame.

[reveman, 2014/04/15 22:29:28]

As I mentioned above, the idea is to make the client responsible for this. I
think it would be a bit weird if the client didn't have to call glFlush.
Ah, wasn't aware of this class. Done.

+    DCHECK(sync_);
+  } else {
+    TRACE_EVENT0("gpu", "CommandsCompletedQuery::End");
+    glFinish();  // Poor man's GPU fence.

[no sievers, 2014/04/15 18:41:15]

Do we need this fallback, or can we not support the query?
I think GLFence should give us pretty good coverage across platforms (esp. if we
add es3).

[reveman, 2014/04/15 22:29:28]

We'll need a fall-back somewhere but maybe it should just be software
compositing. Changed latest patch so it's up to the client to handle this
instead.

+  }
+  return AddToPendingQueue(submit_count);
+}
+
+bool CommandsCompletedQuery::Process() {
+  if (sync_) {
+    int value = GL_UNSIGNALED;
+    glGetSynciv(sync_, GL_SYNC_STATUS, 1, NULL, &value);

[no sievers, 2014/04/15 18:41:15]

See comment in gl_fence.cc that this does not work on OSX 10.7. It uses
glClientWaitSync() != GL_TIMEOUT_EXPIRED instead.

[reveman, 2014/04/15 22:29:28]

Ok, makes sense to use GLFence and handle these type of workarounds in one
place.

+    if (value == GL_UNSIGNALED)
+      return true;
+  }
+  return MarkAsCompleted(0);
+}
+
+void CommandsCompletedQuery::Destroy(bool have_context) {
+  if (have_context && !IsDeleted()) {
+    if (sync_)
+      glDeleteSync(sync_);
+    MarkAsDeleted();
+  }
+}
+
+CommandsCompletedQuery::~CommandsCompletedQuery() {}
+
 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),
+      use_arb_sync_(feature_info->feature_flags().arb_sync),
       query_count_(0) {
   DCHECK(!(use_arb_occlusion_query_for_occlusion_query_boolean_ &&
            use_arb_occlusion_query2_for_occlusion_query_boolean_));
 }
 
 QueryManager::~QueryManager() {
   DCHECK(queries_.empty());
 
   // If this triggers, that means something is keeping a reference to
   // a Query belonging to this.
@@ skipping 25 matching lines @@
       query = new AsyncPixelTransfersCompletedQuery(
           this, target, shm_id, shm_offset);
       break;
     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, use_arb_sync_);
+      break;
     default: {
       GLuint service_id = 0;
       glGenQueriesARB(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 =
@@ skipping 215 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