gpu: Reuse transfer buffers more aggresively

gpu/command_buffer/client/buffer_tracker.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_CLIENT_BUFFER_TRACKER_H_
 #define GPU_COMMAND_BUFFER_CLIENT_BUFFER_TRACKER_H_
 
 #include <GLES2/gl2.h>
 
 #include <queue>
@@ skipping 17 matching lines @@
            unsigned int size,
            int32 shm_id,
            uint32 shm_offset,
            void* address)
         : id_(id),
           size_(size),
           shm_id_(shm_id),
           shm_offset_(shm_offset),
           address_(address),
           mapped_(false),
-          transfer_ready_token_(0) {
+          transfer_ready_token_(0),
+          unused_token_(0),
+          async_query_id_(0) {
     }
 
     GLenum id() const {
       return id_;
     }
 
     unsigned int size() const {
       return size_;
     }
 
@@ skipping 18 matching lines @@
     }
 
     void set_transfer_ready_token(int token) {
       transfer_ready_token_ = token;
     }
 
     uint32 transfer_ready_token() const {
       return transfer_ready_token_;
     }
 
+    void set_used(bool used) {
+      used_ = used;
+    }
+
+    bool used() const {
+      return used_;
+    }
+
+    void set_unused_token(int token) {
+      unused_token_ = token;
+    }
+
+    int unused_token() const {
+      return unused_token_;
+    }
+
+    void set_async_query_id(GLuint async_query_id) {
+      async_query_id_ = async_query_id;
+    }
+
+    GLuint async_query_id() const {
+      return async_query_id_;
+    }
+
    private:
     friend class BufferTracker;
     friend class BufferTrackerTest;
 
     GLuint id_;
     unsigned int size_;
     int32 shm_id_;
     uint32 shm_offset_;
     void* address_;
-    bool mapped_;
+    bool mapped_ : 1;
+    bool used_ : 1;
     int32 transfer_ready_token_;
+    int32 unused_token_;

[epennerAtGoogle, 2014/01/07 00:47:59]

Does this mean: "The buffer is unused after this token passes"? I mildly prefer
"last_usage_token" or something like that. Similarly, I mildly prefer
"last_async_query_id".

[reveman, 2014/01/07 06:32:06]

+1

[jadahl, 2014/01/07 10:52:03]

last_usage_token np. last_async_query_id might be confusing since its the
*active* async query.

+    GLuint async_query_id_;
   };
 
   BufferTracker(MappedMemoryManager* manager);
   ~BufferTracker();
 
   Buffer* CreateBuffer(GLuint id, GLsizeiptr size);
   Buffer* GetBuffer(GLuint id);
   void RemoveBuffer(GLuint id);
+  void UnmanageBuffer(GLuint id);
 
   // Frees the block of memory associated with buffer, pending the passage
   // of a token.
-  void FreePendingToken(Buffer*, int32 token);
+  void FreePendingToken(Buffer* buffer, int32 token);
+  void Free(Buffer* buffer);
 
  private:
   typedef base::hash_map<GLuint, Buffer*> BufferMap;
 
   MappedMemoryManager* mapped_memory_;
   BufferMap buffers_;
 
   DISALLOW_COPY_AND_ASSIGN(BufferTracker);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_CLIENT_BUFFER_TRACKER_H_