Query objects should not be shared between contexts

gpu/command_buffer/client/gles2_implementation_impl_autogen.h

 // Copyright 2014 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.
 
 // This file is auto-generated from
 // gpu/command_buffer/build_gles2_cmd_buffer.py
 // It's formatted by clang-format using chromium coding style:
 //    clang-format -i -style=chromium filename
 // DO NOT EDIT!
 
@@ skipping 293 matching lines @@
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glDeleteBuffers(" << n << ", "
                      << static_cast<const void*>(buffers) << ")");
   GPU_CLIENT_LOG_CODE_BLOCK({
     for (GLsizei i = 0; i < n; ++i) {
       GPU_CLIENT_LOG("  " << i << ": " << buffers[i]);
     }
   });
   GPU_CLIENT_DCHECK_CODE_BLOCK({
     for (GLsizei i = 0; i < n; ++i) {
-      DCHECK(buffers[i] != 0);
+      DCHECK_NE(0, buffers[i]);
     }
   });
   if (n < 0) {
     SetGLError(GL_INVALID_VALUE, "glDeleteBuffers", "n < 0");
     return;
   }
   DeleteBuffersHelper(n, buffers);
   CheckGLError();
 }
 
 void GLES2Implementation::DeleteFramebuffers(GLsizei n,
                                              const GLuint* framebuffers) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glDeleteFramebuffers(" << n << ", "
                      << static_cast<const void*>(framebuffers) << ")");
   GPU_CLIENT_LOG_CODE_BLOCK({
     for (GLsizei i = 0; i < n; ++i) {
       GPU_CLIENT_LOG("  " << i << ": " << framebuffers[i]);
     }
   });
   GPU_CLIENT_DCHECK_CODE_BLOCK({
     for (GLsizei i = 0; i < n; ++i) {
-      DCHECK(framebuffers[i] != 0);
+      DCHECK_NE(0, framebuffers[i]);
     }
   });
   if (n < 0) {
     SetGLError(GL_INVALID_VALUE, "glDeleteFramebuffers", "n < 0");
     return;
   }
   DeleteFramebuffersHelper(n, framebuffers);
   CheckGLError();
 }
 
@@ skipping 11 matching lines @@
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glDeleteRenderbuffers(" << n
                      << ", " << static_cast<const void*>(renderbuffers) << ")");
   GPU_CLIENT_LOG_CODE_BLOCK({
     for (GLsizei i = 0; i < n; ++i) {
       GPU_CLIENT_LOG("  " << i << ": " << renderbuffers[i]);
     }
   });
   GPU_CLIENT_DCHECK_CODE_BLOCK({
     for (GLsizei i = 0; i < n; ++i) {
-      DCHECK(renderbuffers[i] != 0);
+      DCHECK_NE(0, renderbuffers[i]);
     }
   });
   if (n < 0) {
     SetGLError(GL_INVALID_VALUE, "glDeleteRenderbuffers", "n < 0");
     return;
   }
   DeleteRenderbuffersHelper(n, renderbuffers);
   CheckGLError();
 }
 
 void GLES2Implementation::DeleteShader(GLuint shader) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glDeleteShader(" << shader << ")");
   GPU_CLIENT_DCHECK(shader != 0);
   DeleteShaderHelper(shader);
   CheckGLError();
 }
 
 void GLES2Implementation::DeleteTextures(GLsizei n, const GLuint* textures) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glDeleteTextures(" << n << ", "
                      << static_cast<const void*>(textures) << ")");
   GPU_CLIENT_LOG_CODE_BLOCK({
     for (GLsizei i = 0; i < n; ++i) {
       GPU_CLIENT_LOG("  " << i << ": " << textures[i]);
     }
   });
   GPU_CLIENT_DCHECK_CODE_BLOCK({
     for (GLsizei i = 0; i < n; ++i) {
-      DCHECK(textures[i] != 0);
+      DCHECK_NE(0, textures[i]);
     }
   });
   if (n < 0) {
     SetGLError(GL_INVALID_VALUE, "glDeleteTextures", "n < 0");
     return;
   }
   DeleteTexturesHelper(n, textures);
   CheckGLError();
 }
 
@@ skipping 1425 matching lines @@
 }
 
 void GLES2Implementation::GenQueriesEXT(GLsizei n, GLuint* queries) {
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGenQueriesEXT(" << n << ", "
                      << static_cast<const void*>(queries) << ")");
   if (n < 0) {
     SetGLError(GL_INVALID_VALUE, "glGenQueriesEXT", "n < 0");
     return;
   }
   GPU_CLIENT_SINGLE_THREAD_CHECK();
-  GetIdHandler(id_namespaces::kQueries)->MakeIds(this, 0, n, queries);
+  IdAllocatorInterface* id_allocator = GetIdAllocator(id_namespaces::kQueries);
+  for (GLsizei ii = 0; ii < n; ++ii)
+    queries[ii] = id_allocator->AllocateID();
   GenQueriesEXTHelper(n, queries);
   helper_->GenQueriesEXTImmediate(n, queries);
   if (share_group_->bind_generates_resource())
     helper_->CommandBufferHelper::Flush();
   GPU_CLIENT_LOG_CODE_BLOCK({
     for (GLsizei i = 0; i < n; ++i) {
       GPU_CLIENT_LOG("  " << i << ": " << queries[i]);
     }
   });
   CheckGLError();
 }
 
 void GLES2Implementation::DeleteQueriesEXT(GLsizei n, const GLuint* queries) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glDeleteQueriesEXT(" << n << ", "
                      << static_cast<const void*>(queries) << ")");
   GPU_CLIENT_LOG_CODE_BLOCK({
     for (GLsizei i = 0; i < n; ++i) {
       GPU_CLIENT_LOG("  " << i << ": " << queries[i]);
     }
   });
   GPU_CLIENT_DCHECK_CODE_BLOCK({
     for (GLsizei i = 0; i < n; ++i) {
-      DCHECK(queries[i] != 0);
+      DCHECK_NE(0, queries[i]);
     }
   });
   if (n < 0) {
     SetGLError(GL_INVALID_VALUE, "glDeleteQueriesEXT", "n < 0");
     return;
   }
   DeleteQueriesEXTHelper(n, queries);
   CheckGLError();
 }
 
@@ skipping 23 matching lines @@
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glDeleteVertexArraysOES(" << n
                      << ", " << static_cast<const void*>(arrays) << ")");
   GPU_CLIENT_LOG_CODE_BLOCK({
     for (GLsizei i = 0; i < n; ++i) {
       GPU_CLIENT_LOG("  " << i << ": " << arrays[i]);
     }
   });
   GPU_CLIENT_DCHECK_CODE_BLOCK({
     for (GLsizei i = 0; i < n; ++i) {
-      DCHECK(arrays[i] != 0);
+      DCHECK_NE(0, arrays[i]);
     }
   });
   if (n < 0) {
     SetGLError(GL_INVALID_VALUE, "glDeleteVertexArraysOES", "n < 0");
     return;
   }
   DeleteVertexArraysOESHelper(n, arrays);
   CheckGLError();
 }
 
@@ skipping 206 matching lines @@
                                         bounds_width,
                                         bounds_height,
                                         uv_x,
                                         uv_y,
                                         uv_width,
                                         uv_height);
   CheckGLError();
 }
 
 #endif  // GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_IMPL_AUTOGEN_H_