Enable occlusion query feature on OpenGL3.3 and later

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 <stddef.h>
 #include <stdint.h>
 
 #include "base/atomicops.h"
@@ skipping 696 matching lines @@
 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),
+      no_covert_any_samples_passed_conservative_target_for_es3_(
+          feature_info->feature_flags(
+            ).no_covert_any_samples_passed_conservative_target_for_es3),
+      covert_any_samples_passed_conservative_target_for_low_gl_(
+          feature_info->feature_flags(
+            ).covert_any_samples_passed_conservative_target_for_low_gl),
       update_disjoints_continually_(false),
       disjoint_notify_shm_id_(-1),
       disjoint_notify_shm_offset_(0),
       disjoints_notified_(0),
       query_count_(0) {
   DCHECK(!(use_arb_occlusion_query_for_occlusion_query_boolean_ &&
            use_arb_occlusion_query2_for_occlusion_query_boolean_));
   DCHECK(decoder);
   gl::GLContext* context = decoder_->GetGLContext();
   if (context) {
@@ skipping 142 matching lines @@
 }
 
 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;
+      if (!no_covert_any_samples_passed_conservative_target_for_es3_) {
+        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;
+        } else if (covert_any_samples_passed_conservative_target_for_low_gl_) {
+          // When underlying driver is lower than OpenGL4.3, it does not have a
+          // GL_ANY_SAMPLES_PASSED_CONSERVATIVE
+          // target.
+          target = GL_ANY_SAMPLES_PASSED_EXT;
+        }
       }
       break;
     default:
       break;
   }
   return target;
 }
 
 void QueryManager::BeginQueryHelper(GLenum target, GLuint id) {
   target = AdjustTargetForEmulation(target);
@@ skipping 233 matching lines @@
   for (std::pair<const GLenum, scoped_refptr<Query> >& it : active_queries_) {
     if (it.second->IsPaused()) {
       it.second->Resume();
       DCHECK(it.second->IsActive());
     }
   }
 }
 
 }  // namespace gles2
 }  // namespace gpu