Implement basic query functionality in the passthrough command buffer.

gpu/command_buffer/service/gles2_cmd_decoder_passthrough.h

 // Copyright (c) 2016 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 contains the GLES2DecoderPassthroughImpl class.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_PASSTHROUGH_H_
 #define GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_PASSTHROUGH_H_
 
 #include "base/memory/ref_counted.h"
@@ skipping 223 matching lines @@
   void MarkContextLost(error::ContextLostReason reason) override;
 
   Logger* GetLogger() override;
 
   const ContextState* GetContextState() override;
   scoped_refptr<ShaderTranslatorInterface> GetTranslator(GLenum type) override;
 
  private:
   void BuildExtensionsString();
 
+  void InsertError(GLenum error, const std::string& message);
+  GLenum PopError();
+  bool FlushErrors();
+
+  bool IsEmulatedQueryTarget(GLenum target) const;
+  error::Error ProcessQueries(bool did_finish);
+
   int commands_to_process_;
 
   DebugMarkerManager debug_marker_manager_;
   Logger logger_;
 
 #define GLES2_CMD_OP(name) \
   Error Handle##name(uint32_t immediate_data_size, const volatile void* data);
 
   GLES2_COMMAND_LIST(GLES2_CMD_OP)
 #undef GLES2_CMD_OP
@@ skipping 42 matching lines @@
   ClientServiceMap<GLuint, GLuint> query_id_map_;
   ClientServiceMap<GLuint, GLuint> vertex_array_id_map_;
 
   // Mailboxes
   scoped_refptr<MailboxManager> mailbox_manager_;
 
   // State tracking of currently bound 2D textures (client IDs)
   size_t active_texture_unit_;
   std::vector<GLuint> bound_textures_;
 
+  // Track the service-id to type of all queries for validation
+  struct QueryInfo {
+    GLenum type = GL_NONE;
+  };
+  std::unordered_map<GLuint, QueryInfo> query_info_map_;

[piman, 2016/11/18 19:32:09]

nit: any reason to use the service id to index here? If using the client ids I
think it would save a few map lookups.

[Geoff Lang, 2016/11/21 18:12:16]

I found it needed the same number of lookups because the service ID was always
needed at the same time.  I'd like to merge the two maps though, no technical
reason why the service id and and query type can't be stored in the same struct
but the ClientServiceMap class can't handle that yet.  

+
+  // All queries that are waiting for their results to be ready
+  struct PendingQuery {
+    GLenum target = GL_NONE;
+    GLuint service_id = 0;
+
+    int32_t shm_id = 0;
+    uint32_t shm_offset = 0;
+    base::subtle::Atomic32 submit_count = 0;
+  };
+  std::deque<PendingQuery> pending_queries_;
+
+  // Currently active queries
+  struct ActiveQuery {
+    GLuint service_id = 0;
+    int32_t shm_id = 0;
+    uint32_t shm_offset = 0;
+  };
+  std::unordered_map<GLenum, ActiveQuery> active_queries_;
+
+  std::set<GLenum> errors_;
+
   std::vector<std::string> emulated_extensions_;
   std::string extension_string_;
 
 // Include the prototypes of all the doer functions from a separate header to
 // keep this file clean.
 #include "gpu/command_buffer/service/gles2_cmd_decoder_passthrough_doer_prototypes.h"
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_PASSTHROUGH_H_