Flag INV_OP during BeginQuery if id is not obtained from GenQueriesEXT.

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 494 matching lines @@
           this, target, shm_id, shm_offset, service_id);
       break;
     }
   }
   std::pair<QueryMap::iterator, bool> result =
       queries_.insert(std::make_pair(client_id, query));
   DCHECK(result.second);
   return query.get();
 }
 
+void QueryManager::GenQueries(GLsizei n, const GLuint* queries) {
+  DCHECK_GE(n, 0);
+  for (GLsizei i = 0; i < n; ++i) {
+    generated_query_ids_.insert(queries[i]);
+  }
+}
+
+bool QueryManager::IsValidQuery(GLuint id) {
+  GeneratedQueryIds::iterator it = generated_query_ids_.find(id);
+  return it != generated_query_ids_.end() ? true : false;

[piman, 2014/04/22 00:37:31]

'? true : false' doesn't add anything. Just return it !=
generated_query_ids_.end()

+}
+
 QueryManager::Query* QueryManager::GetQuery(
     GLuint client_id) {
   QueryMap::iterator it = queries_.find(client_id);
   return it != queries_.end() ? it->second.get() : NULL;
 }
 
 void QueryManager::RemoveQuery(GLuint client_id) {
   QueryMap::iterator it = queries_.find(client_id);
   if (it != queries_.end()) {
     Query* query = it->second.get();
+    generated_query_ids_.erase(client_id);

[piman, 2014/04/22 00:37:31]

According to spec, this must be removed in DeleteQueriesEXT even if no query was
created with BeginQueryEXT.

So, this should be out of the if test.

[rptr, 2014/04/22 05:43:18]

Done.

     RemovePendingQuery(query);
     query->MarkAsDeleted();
     queries_.erase(it);
   }
 }
 
 void QueryManager::StartTracking(QueryManager::Query* /* query */) {
   ++query_count_;
 }
 
@@ skipping 190 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