Implement GL_EXT_occlusion_query_boolean on OSX

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/logging.h"
 #include "base/time.h"
 #include "gpu/command_buffer/common/gles2_cmd_format.h"
 #include "gpu/command_buffer/service/common_decoder.h"
+#include "gpu/command_buffer/service/feature_info.h"
 
 namespace gpu {
 namespace gles2 {
 
 class AllSamplesPassedQuery : public QueryManager::Query {
  public:
   AllSamplesPassedQuery(
       QueryManager* manager, GLenum target, int32 shm_id, uint32 shm_offset,
       GLuint service_id);
   virtual ~AllSamplesPassedQuery();
@@ skipping 38 matching lines @@
   GLuint available = 0;
   glGetQueryObjectuivARB(
       service_id_, GL_QUERY_RESULT_AVAILABLE_EXT, &available);
   if (!available) {
     return true;
   }
   GLuint result = 0;
   glGetQueryObjectuivARB(
       service_id_, GL_QUERY_RESULT_EXT, &result);
 
-  return MarkAsCompleted(result);
+  return MarkAsCompleted(result != 0);

[Nico, 2014/01/08 04:17:09]

Why this change? Should MarkAsCompleted() get a bool parameter instead?

[Zhenyao Mo, 2014/01/08 18:55:11]

This should actually be MarkAsCompleted(result == 0 ? 0 : 1)

[Zhenyao Mo, 2014/01/08 19:08:18]

If I understand this correctly (without going through all the details), in
general the query returns the number of pixels that a draw touched, but for this
extension GL_EXT_occlusion_query_boolean emulation, we only want true or false.

 }
 
 class CommandsIssuedQuery : public QueryManager::Query {
  public:
   CommandsIssuedQuery(
       QueryManager* manager, GLenum target, int32 shm_id, uint32 shm_offset);
   virtual ~CommandsIssuedQuery();
 
   virtual bool Begin() OVERRIDE;
   virtual bool End(uint32 submit_count) OVERRIDE;
@@ skipping 30 matching lines @@
 }
 
 void CommandsIssuedQuery::Destroy(bool /* have_context */) {
   if (!IsDeleted()) {
     MarkAsDeleted();
   }
 }
 
 QueryManager::QueryManager(
     CommonDecoder* decoder,
-    bool use_arb_occlusion_query2_for_occlusion_query_boolean)
+    FeatureInfo* feature_info)
     : decoder_(decoder),
       use_arb_occlusion_query2_for_occlusion_query_boolean_(
-          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_));
 }
 
 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 45 matching lines @@
 }
 
 void QueryManager::StartTracking(QueryManager::Query* /* query */) {
   ++query_count_;
 }
 
 void QueryManager::StopTracking(QueryManager::Query* /* query */) {
   --query_count_;
 }
 
+GLenum QueryManager::AdjustTargetForEmulation(GLenum target) {
+  switch (target) {
+    case GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT:
+    case GL_ANY_SAMPLES_PASSED_EXT:
+      if (use_arb_occlusion_query2_for_occlusion_query_boolean_) {
+        // ARB_occlusion_query2 does not have a
+        // GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT
+        // target.
+        target = GL_ANY_SAMPLES_PASSED_EXT;
+      } else if (use_arb_occlusion_query_for_occlusion_query_boolean_) {
+        // ARB_occlusion_query does not have a
+        // GL_ANY_SAMPLES_PASSED_EXT
+        // target.
+        target = GL_SAMPLES_PASSED_ARB;
+      }
+      break;
+    default:
+      break;
+  }
+  return target;
+}
+
 void QueryManager::BeginQueryHelper(GLenum target, GLuint id) {
-  // ARB_occlusion_query2 does not have a GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT
-  // target.
-  if (use_arb_occlusion_query2_for_occlusion_query_boolean_) {
-    target = GL_ANY_SAMPLES_PASSED_EXT;
-  }
+  target = AdjustTargetForEmulation(target);
   glBeginQueryARB(target, id);
 }
 
 void QueryManager::EndQueryHelper(GLenum target) {
-  // ARB_occlusion_query2 does not have a GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT
-  // target.
-  if (use_arb_occlusion_query2_for_occlusion_query_boolean_) {
-    target = GL_ANY_SAMPLES_PASSED_EXT;
-  }
+  target = AdjustTargetForEmulation(target);
   glEndQueryARB(target);
 }
 
 QueryManager::Query::Query(
      QueryManager* manager, GLenum target, int32 shm_id, uint32 shm_offset)
     : manager_(manager),
       target_(target),
       shm_id_(shm_id),
       shm_offset_(shm_offset),
       submit_count_(0),
@@ skipping 91 matching lines @@
   if (!RemovePendingQuery(query)) {
     return false;
   }
   return query->End(submit_count);
 }
 
 }  // namespace gles2
 }  // namespace gpu