cc: Reduce command buffer flushes related to creating texture ids.

cc/test/test_web_graphics_context_3d.cc

 // Copyright 2013 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 "cc/test/test_web_graphics_context_3d.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 198 matching lines @@
   for (int i = 0; i < count; ++i) {
     ids[i] = NextTextureId();
     DCHECK_NE(ids[i], kExternalTextureId);
   }
   base::AutoLock lock(namespace_->lock);
   for (int i = 0; i < count; ++i)
     namespace_->textures.Append(ids[i], new TestTexture());
 }
 
 void TestWebGraphicsContext3D::deleteBuffers(WGC3Dsizei count, WebGLId* ids) {
-  base::AutoLock lock(namespace_->lock);
-  for (int i = 0; i < count; ++i) {
-    unsigned context_id = ids[i] >> 17;
-    unsigned buffer_id = ids[i] & 0x1ffff;
-    DCHECK(buffer_id && buffer_id < namespace_->next_buffer_id);
-    DCHECK_EQ(context_id, context_id_);
-  }
+  for (int i = 0; i < count; ++i)
+    RetireBufferId(ids[i]);
 }
 
 void TestWebGraphicsContext3D::deleteFramebuffers(
     WGC3Dsizei count, WebGLId* ids) {
   for (int i = 0; i < count; ++i)
     DCHECK_EQ(kFramebufferId | context_id_ << 16, ids[i]);
 }
 
 void TestWebGraphicsContext3D::deleteRenderbuffers(
     WGC3Dsizei count, WebGLId* ids) {
   for (int i = 0; i < count; ++i)
     DCHECK_EQ(kRenderbufferId | context_id_ << 16, ids[i]);
 }
 
 void TestWebGraphicsContext3D::deleteTextures(WGC3Dsizei count, WebGLId* ids) {
+  for (int i = 0; i < count; ++i)
+    RetireTextureId(ids[i]);
   base::AutoLock lock(namespace_->lock);
   for (int i = 0; i < count; ++i) {
     namespace_->textures.Remove(ids[i]);
     texture_targets_.UnbindTexture(ids[i]);
   }
 }
 
 WebGLId TestWebGraphicsContext3D::createBuffer() {
   WebGLId id;
   genBuffers(1, &id);
@@ skipping 201 matching lines @@
 void TestWebGraphicsContext3D::SwapBuffersComplete() {
   if (swap_buffers_callback_)
     swap_buffers_callback_->onSwapBuffersComplete();
 }
 
 void TestWebGraphicsContext3D::bindBuffer(WebKit::WGC3Denum target,
                                           WebKit::WebGLId buffer) {
   bound_buffer_ = buffer;
   if (!bound_buffer_)
     return;
-  unsigned context_id = buffer >> 17;
-  unsigned buffer_id = buffer & 0x1ffff;
+  unsigned context_id = buffer >> 16;
+  unsigned buffer_id = buffer & 0xffff;
   base::AutoLock lock(namespace_->lock);
-  DCHECK(buffer_id && buffer_id < namespace_->next_buffer_id);
+  DCHECK(buffer_id);
+  DCHECK_LT(buffer_id, namespace_->next_buffer_id);
   DCHECK_EQ(context_id, context_id_);
 
   base::ScopedPtrHashMap<unsigned, Buffer>& buffers = namespace_->buffers;
   if (buffers.count(bound_buffer_) == 0)
     buffers.set(bound_buffer_, make_scoped_ptr(new Buffer).Pass());
 
   buffers.get(bound_buffer_)->target = target;
 }
 
 void TestWebGraphicsContext3D::bufferData(WebKit::WGC3Denum target,
@@ skipping 48 matching lines @@
   WebKit::WGC3Duint image_id = NextImageId();
   base::AutoLock lock(namespace_->lock);
   base::ScopedPtrHashMap<unsigned, Image>& images = namespace_->images;
   images.set(image_id, make_scoped_ptr(new Image).Pass());
   images.get(image_id)->pixels.reset(new uint8[width * height * 4]);
   return image_id;
 }
 
 void TestWebGraphicsContext3D::destroyImageCHROMIUM(
     WebKit::WGC3Duint id) {
-  base::AutoLock lock(namespace_->lock);
-  unsigned context_id = id >> 17;
-  unsigned image_id = id & 0x1ffff;
-  DCHECK(image_id && image_id < namespace_->next_image_id);
-  DCHECK_EQ(context_id, context_id_);
+  RetireImageId(id);
 }
 
 void TestWebGraphicsContext3D::getImageParameterivCHROMIUM(
     WebKit::WGC3Duint image_id,
     WebKit::WGC3Denum pname,
     WebKit::WGC3Dint* params) {
   base::AutoLock lock(namespace_->lock);
   DCHECK_GT(namespace_->images.count(image_id), 0u);
   DCHECK_EQ(GL_IMAGE_ROWBYTES_CHROMIUM, static_cast<int>(pname));
   *params = 0;
@@ skipping 30 matching lines @@
 }
 
 WebGLId TestWebGraphicsContext3D::NextTextureId() {
   base::AutoLock lock(namespace_->lock);
   WebGLId texture_id = namespace_->next_texture_id++;
   DCHECK(texture_id < (1 << 16));
   texture_id |= context_id_ << 16;
   return texture_id;
 }
 
+void TestWebGraphicsContext3D::RetireTextureId(WebGLId id) {
+  base::AutoLock lock(namespace_->lock);
+  unsigned context_id = id >> 16;
+  unsigned texture_id = id & 0xffff;
+  DCHECK(texture_id);
+  DCHECK_LT(texture_id, namespace_->next_texture_id);
+  DCHECK_EQ(context_id, context_id_);
+}
+
 WebGLId TestWebGraphicsContext3D::NextBufferId() {
   base::AutoLock lock(namespace_->lock);
   WebGLId buffer_id = namespace_->next_buffer_id++;
-  DCHECK(buffer_id < (1 << 17));
-  buffer_id |= context_id_ << 17;
+  DCHECK(buffer_id < (1 << 16));
+  buffer_id |= context_id_ << 16;
   return buffer_id;
 }
 
+void TestWebGraphicsContext3D::RetireBufferId(WebGLId id) {
+  base::AutoLock lock(namespace_->lock);
+  unsigned context_id = id >> 16;
+  unsigned buffer_id = id & 0xffff;
+  DCHECK(buffer_id);
+  DCHECK_LT(buffer_id, namespace_->next_buffer_id);
+  DCHECK_EQ(context_id, context_id_);
+}
+
 WebKit::WGC3Duint TestWebGraphicsContext3D::NextImageId() {
   base::AutoLock lock(namespace_->lock);
   WGC3Duint image_id = namespace_->next_image_id++;
-  DCHECK(image_id < (1 << 17));
-  image_id |= context_id_ << 17;
+  DCHECK(image_id < (1 << 16));
+  image_id |= context_id_ << 16;
   return image_id;
 }
 
+void TestWebGraphicsContext3D::RetireImageId(WebGLId id) {
+  base::AutoLock lock(namespace_->lock);
+  unsigned context_id = id >> 16;
+  unsigned image_id = id & 0xffff;
+  DCHECK(image_id);
+  DCHECK_LT(image_id, namespace_->next_image_id);
+  DCHECK_EQ(context_id, context_id_);
+}
+
 size_t TestWebGraphicsContext3D::GetTransferBufferMemoryUsedBytes() const {
   size_t total_bytes = 0;
   base::ScopedPtrHashMap<unsigned, Buffer>& buffers = namespace_->buffers;
   base::ScopedPtrHashMap<unsigned, Buffer>::iterator it = buffers.begin();
   for (; it != buffers.end(); ++it) {
     Buffer* buffer = it->second;
     if (buffer->target == GL_PIXEL_UNPACK_TRANSFER_BUFFER_CHROMIUM)
       total_bytes += buffer->size;
   }
   return total_bytes;
@@ skipping 41 matching lines @@
 
 TestWebGraphicsContext3D::Buffer::Buffer() : target(0), size(0) {}
 
 TestWebGraphicsContext3D::Buffer::~Buffer() {}
 
 TestWebGraphicsContext3D::Image::Image() {}
 
 TestWebGraphicsContext3D::Image::~Image() {}
 
 }  // namespace cc