Allowed GLES query target migration between binary occlusion types

gpu/command_buffer/client/query_tracker.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/client/query_tracker.h"
 
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 #include <GLES2/gl2extchromium.h>
 
@@ skipping 188 matching lines @@
     }
   }
   return state_ == kComplete;
 }
 
 uint32 QueryTracker::Query::GetResult() const {
   DCHECK(state_ == kComplete || state_ == kUninitialized);
   return result_;
 }
 
+bool QueryTracker::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;
+  }
+}
+
 QueryTracker::QueryTracker(MappedMemoryManager* manager)
     : query_sync_manager_(manager) {
 }
 
 QueryTracker::~QueryTracker() {
   while (!queries_.empty()) {
     delete queries_.begin()->second;
     queries_.erase(queries_.begin());
   }
   while (!removed_queries_.empty()) {
@@ skipping 53 matching lines @@
     }
 
     query_sync_manager_.Free(query->info_);
     it = removed_queries_.erase(it);
     delete query;
   }
 }
 
 }  // namespace gles2
 }  // namespace gpu