gpu: Add async pixel transfer interface, stub and tests.

gpu/command_buffer/service/texture_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_TEXTURE_MANAGER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_TEXTURE_MANAGER_H_
 
+#include <list>
 #include <string>
 #include <vector>
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "gpu/command_buffer/service/feature_info.h"
 #include "gpu/command_buffer/service/gl_utils.h"
 #include "gpu/command_buffer/service/memory_tracking.h"
 #include "gpu/gpu_export.h"
+#include "ui/gl/async_pixel_transfer_delegate.h"
 #include "ui/gl/gl_image.h"
 
 namespace gpu {
 namespace gles2 {
 
 class GLES2Decoder;
 class Display;
 class TextureDefinition;
 
 // This class keeps track of the textures and their sizes so we can do NPOT and
@@ skipping 143 matching lines @@
     }
 
     void SetStreamTexture(bool stream_texture) {
       stream_texture_ = stream_texture;
     }
 
     int IsStreamTexture() {
       return stream_texture_;
     }
 
+    gfx::AsyncPixelTransferState* GetAsyncTransferState() const {
+      return async_transfer_state_.get();
+    }
+    void SetAsyncTransferState(scoped_ptr<gfx::AsyncPixelTransferState> state) {
+      async_transfer_state_ = state.Pass();
+    }
+    bool AsyncTransferIsInProgress() {
+      return async_transfer_state_ &&
+          async_transfer_state_->TransferIsInProgress();
+    }
+
     void SetImmutable(bool immutable) {
       immutable_ = immutable;
     }
 
     bool IsImmutable() {
       return immutable_;
     }
 
     // Whether a particular level/face is cleared.
     bool IsLevelCleared(GLenum target, GLint level);
 
+    // Whether the texture has been defined
+    bool IsDefined() {
+      return estimated_size() > 0;
+    }
+
    private:
     friend class TextureManager;
     friend class base::RefCounted<TextureInfo>;
 
     ~TextureInfo();
 
     struct LevelInfo {
       LevelInfo();
       LevelInfo(const LevelInfo& rhs);
       ~LevelInfo();
@@ skipping 132 matching lines @@
     // The number of framebuffers this texture is attached to.
     int framebuffer_attachment_count_;
 
     // Whether the associated context group owns this texture and should delete
     // it.
     bool owned_;
 
     // Whether this is a special streaming texture.
     bool stream_texture_;
 
+    // State to facilitate async transfers on this texture.
+    scoped_ptr<gfx::AsyncPixelTransferState> async_transfer_state_;
+
     // Whether the texture is immutable and no further changes to the format
     // or dimensions of the texture object can be made.
     bool immutable_;
 
     // Size in bytes this texture is assumed to take in memory.
     uint32 estimated_size_;
 
     DISALLOW_COPY_AND_ASSIGN(TextureInfo);
   };
 
@@ skipping 169 matching lines @@
       GLenum target,
       GLint level,
       gfx::GLImage* image);
 
   void AddToSignature(
       TextureInfo* info,
       GLenum target,
       GLint level,
       std::string* signature) const;
 
+  // Transfers added will get their TextureInfo updated at the same time
+  // the async transfer is bound to the real texture.
+  void AddPendingAsyncPixelTransfer(
+      base::WeakPtr<gfx::AsyncPixelTransferState> state, TextureInfo* info);
+  void BindFinishedAsyncPixelTransfers(bool* texture_dirty,
+                                       bool* framebuffer_dirty);
+
  private:
   // Helper for Initialize().
   TextureInfo::Ref CreateDefaultAndBlackTextures(
       GLenum target,
       GLuint* black_texture);
 
   void StartTracking(TextureInfo* info);
   void StopTracking(TextureInfo* info);
 
   MemoryTypeTracker* GetMemTracker(GLenum texture_pool);
@@ skipping 22 matching lines @@
   bool have_context_;
 
   // Black (0,0,0,1) textures for when non-renderable textures are used.
   // NOTE: There is no corresponding TextureInfo for these textures.
   // TextureInfos are only for textures the client side can access.
   GLuint black_texture_ids_[kNumDefaultTextures];
 
   // The default textures for each target (texture name = 0)
   TextureInfo::Ref default_textures_[kNumDefaultTextures];
 
+  // Async texture allocations which haven't been bound to their textures
+  // yet. This facilitates updating the TextureInfo at the same time the
+  // real texture data is bound.
+  typedef std::pair<base::WeakPtr<gfx::AsyncPixelTransferState>,
+                    TextureInfo*> PendingAsyncTransfer;
+  typedef std::list<PendingAsyncTransfer> PendingAsyncTransferList;
+  PendingAsyncTransferList pending_async_transfers_;
+
   DISALLOW_COPY_AND_ASSIGN(TextureManager);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_TEXTURE_MANAGER_H_