Re-land: Mark async texture uploads as completed from the upload thread.

gpu/command_buffer/service/query_manager.h

 // 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.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_QUERY_MANAGER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_QUERY_MANAGER_H_
 
 #include <deque>
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
@@ skipping 71 matching lines @@
 
     // Returns false if shared memory for sync is invalid.
     bool MarkAsCompleted(uint64 result);
 
     void MarkAsPending(uint32 submit_count) {
       DCHECK(!pending_);
       pending_ = true;
       submit_count_ = submit_count;
     }
 
+    void UnmarkAsPending() {
+      DCHECK(pending_);
+      pending_ = false;
+    }
+
     // Returns false if shared memory for sync is invalid.
     bool AddToPendingQueue(uint32 submit_count) {
       return manager_->AddPendingQuery(this, submit_count);
     }
 
+    // Returns false if shared memory for sync is invalid.
+    bool AddToPendingTransferQueue(uint32 submit_count) {
+      return manager_->AddPendingTransferQuery(this, submit_count);
+    }
+
     void BeginQueryHelper(GLenum target, GLuint id) {
       manager_->BeginQueryHelper(target, id);
     }
 
     void EndQueryHelper(GLenum target) {
       manager_->EndQueryHelper(target);
     }
 
+    uint32 submit_count() const {
+      return submit_count_;
+    }
+
    private:
     friend class QueryManager;
     friend class QueryManagerTest;
     friend class base::RefCounted<Query>;
 
-    uint32 submit_count() const {
-      return submit_count_;
-    }
-
     // The manager that owns this Query.
     QueryManager* manager_;
 
     // The type of query.
     GLenum target_;
 
     // The shared memory used with this Query.
     int32 shm_id_;
     uint32 shm_offset_;
 
@@ skipping 31 matching lines @@
   // Returns false if any query is pointing to invalid shared memory.
   bool EndQuery(Query* query, uint32 submit_count);
 
   // Processes pending queries. Returns false if any queries are pointing
   // to invalid shared memory.
   bool ProcessPendingQueries();
 
   // True if there are pending queries.
   bool HavePendingQueries();
 
+  // Processes pending transfer queries. Returns false if any queries are
+  // pointing to invalid shared memory.
+  bool ProcessPendingTransferQueries();
+
+  // True if there are pending transfer queries.
+  bool HavePendingTransferQueries();
+
   GLES2Decoder* decoder() const {
     return decoder_;
   }
 
  private:
   void StartTracking(Query* query);
   void StopTracking(Query* query);
 
   // Wrappers for BeginQueryARB and EndQueryARB to hide differences between
   // ARB_occlusion_query2 and EXT_occlusion_query_boolean.
   void BeginQueryHelper(GLenum target, GLuint id);
   void EndQueryHelper(GLenum target);
 
   // Adds to queue of queries waiting for completion.
   // Returns false if any query is pointing to invalid shared memory.
   bool AddPendingQuery(Query* query, uint32 submit_count);
 
+  // Adds to queue of transfer queries waiting for completion.
+  // Returns false if any query is pointing to invalid shared memory.
+  bool AddPendingTransferQuery(Query* query, uint32 submit_count);
+
   // Removes a query from the queue of pending queries.
   // Returns false if any query is pointing to invalid shared memory.
   bool RemovePendingQuery(Query* query);
 
   // Returns a target used for the underlying GL extension
   // used to emulate a query.
   GLenum AdjustTargetForEmulation(GLenum target);
 
   // Used to validate shared memory and get GL errors.
   GLES2Decoder* decoder_;
 
   bool use_arb_occlusion_query2_for_occlusion_query_boolean_;
   bool use_arb_occlusion_query_for_occlusion_query_boolean_;
 
   // Counts the number of Queries allocated with 'this' as their manager.
   // Allows checking no Query will outlive this.
   unsigned query_count_;
 
   // Info for each query in the system.
   typedef base::hash_map<GLuint, Query::Ref> QueryMap;
   QueryMap queries_;
 
   // Queries waiting for completion.
   typedef std::deque<Query::Ref> QueryQueue;
   QueryQueue pending_queries_;
 
+  // Async pixel transfer queries waiting for completion.
+  QueryQueue pending_transfer_queries_;
+
   DISALLOW_COPY_AND_ASSIGN(QueryManager);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_QUERY_MANAGER_H_