Allowed GLES query target migration between binary occlusion types

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 626 matching lines @@
     return false;
   }
 
   pending_ = false;
   sync->result = result;
   base::subtle::Release_Store(&sync->process_count, submit_count_);
 
   return true;
 }
 
+bool QueryManager::Query::UpdateTarget(GLenum target) {
+  switch (target_) {
+    // The boolean occlusion targets are interchangable.
+    case GL_ANY_SAMPLES_PASSED:
+    case GL_ANY_SAMPLES_PASSED_CONSERVATIVE:
+      if (target == GL_ANY_SAMPLES_PASSED ||
+          target == GL_ANY_SAMPLES_PASSED_CONSERVATIVE) {
+        target_ = target;
+        return true;
+      };
+      return false;
+    // Otherwise target is finalized the first time beginQuery() is called.
+    default:
+      return target_ == target;
+  }
+}
+
 bool QueryManager::ProcessPendingQueries(bool did_finish) {
   while (!pending_queries_.empty()) {
     Query* query = pending_queries_.front().get();
     if (!query->Process(did_finish)) {
       return false;
     }
     if (query->pending()) {
       break;
     }
     query->RunCallbacks();
@@ skipping 90 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