Use mapped memory for uploading large textures.

gpu/command_buffer/client/mapped_memory_unittest.cc

 // 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.
 
 #include "gpu/command_buffer/client/mapped_memory.h"
 
 #include <list>
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 306 matching lines @@
   manager_->set_chunk_size_multiple(kChunkSize);
 
   // Allocate one chunk worth of memory.
   int32 id1 = -1;
   unsigned int offset1 = 0xFFFFFFFFU;
   void* mem1 = manager_->Alloc(kChunkSize, &id1, &offset1);
   ASSERT_TRUE(mem1);
   EXPECT_NE(-1, id1);
   EXPECT_EQ(0u, offset1);
 
+  EXPECT_EQ(kChunkSize, manager_->allocated_memory());
+
+  manager_->Free(mem1);
+
   // Allocate half a chunk worth of memory again.
   // The same chunk will be used.
   int32 id2 = -1;
   unsigned int offset2 = 0xFFFFFFFFU;
   void* mem2 = manager_->Alloc(kChunkSize, &id2, &offset2);
   ASSERT_TRUE(mem2);
   EXPECT_NE(-1, id2);
   EXPECT_EQ(0u, offset2);
 
   // Expect two chunks to be allocated, exceeding the limit,
   // since all memory is in use.
-  EXPECT_EQ(2 * kChunkSize, manager_->allocated_memory());
+  EXPECT_EQ(kChunkSize, manager_->allocated_memory());
 
-  manager_->Free(mem1);
   manager_->Free(mem2);
 }
 
 TEST_F(MappedMemoryManagerTest, MemoryLimitWithReuse) {
   const unsigned int kSize = 1024;
   // Reset the manager with a memory limit.
   manager_.reset(new MappedMemoryManager(
       helper_.get(), base::Bind(&EmptyPoll), kSize));
   const unsigned int kChunkSize = 2 * 1024;
   manager_->set_chunk_size_multiple(kChunkSize);
@@ skipping 55 matching lines @@
 }
 
 TEST_F(MappedMemoryManagerTest, Poll) {
   std::list<void*> unmanaged_memory_list;
 
   const unsigned int kSize = 1024;
   // Reset the manager with a memory limit.
   manager_.reset(new MappedMemoryManager(
       helper_.get(),
       base::Bind(&Poll, this, &unmanaged_memory_list),
-      kSize));
+      kSize*2));
 
   // Allocate kSize bytes. Don't add the address to
   // the unmanaged memory list, so that it won't be free:ed just yet.
   int32 id1;
   unsigned int offset1;
   void* mem1 = manager_->Alloc(kSize, &id1, &offset1);
   EXPECT_EQ(manager_->bytes_in_use(), kSize);
 
   // Allocate kSize more bytes, and make sure we grew.
   int32 id2;
@@ skipping 12 matching lines @@
   unsigned int offset3;
   void* mem3 = manager_->Alloc(kSize, &id3, &offset3);
   EXPECT_EQ(manager_->bytes_in_use(), kSize * 2);
 
   manager_->Free(mem2);
   manager_->Free(mem3);
   EXPECT_EQ(manager_->bytes_in_use(), static_cast<size_t>(0));
 }
 
 }  // namespace gpu