| Index: cc/resources/resource_provider.cc
|
| diff --git a/cc/resources/resource_provider.cc b/cc/resources/resource_provider.cc
|
| index f9c4b3e8d2d52740f905fed5393cfe5c18cf852f..00522df996900bf384ca11dfbab9947db47a53a1 100644
|
| --- a/cc/resources/resource_provider.cc
|
| +++ b/cc/resources/resource_provider.cc
|
| @@ -843,11 +843,10 @@ const ResourceProvider::Resource* ResourceProvider::LockForRead(ResourceId id) {
|
|
|
| GLES2Interface* gl = ContextGL();
|
| DCHECK(gl);
|
| - resource->gl_id = texture_id_allocator_->NextId();
|
| - GLC(gl, gl->BindTexture(resource->target, resource->gl_id));
|
| - GLC(gl,
|
| - gl->ConsumeTextureCHROMIUM(resource->mailbox.target(),
|
| - resource->mailbox.name()));
|
| + resource->gl_id =
|
| + GLC(gl,
|
| + gl->CreateAndConsumeTextureCHROMIUM(resource->mailbox.target(),
|
| + resource->mailbox.name()));
|
| }
|
|
|
| if (!resource->pixels && resource->has_shared_bitmap_id &&
|
| @@ -1516,9 +1515,7 @@ void ResourceProvider::TransferResource(GLES2Interface* gl,
|
| LazyCreate(source);
|
| DCHECK(source->gl_id);
|
| DCHECK(source->origin == Resource::Internal);
|
| - GLC(gl,
|
| - gl->BindTexture(resource->mailbox_holder.texture_target,
|
| - source->gl_id));
|
| +
|
| if (source->image_id) {
|
| DCHECK(source->dirty_image);
|
| BindImageForSampling(source);
|
| @@ -1527,8 +1524,11 @@ void ResourceProvider::TransferResource(GLES2Interface* gl,
|
| // Don't set a sync point, the caller will do it.
|
| GLC(gl, gl->GenMailboxCHROMIUM(resource->mailbox_holder.mailbox.name));
|
| GLC(gl,
|
| - gl->ProduceTextureCHROMIUM(resource->mailbox_holder.texture_target,
|
| - resource->mailbox_holder.mailbox.name));
|
| + gl->ProduceTextureDirectCHROMIUM(
|
| + source->gl_id,
|
| + resource->mailbox_holder.texture_target,
|
| + resource->mailbox_holder.mailbox.name));
|
| +
|
| source->mailbox = TextureMailbox(resource->mailbox_holder);
|
| } else {
|
| DCHECK(source->mailbox.IsTexture());
|
|
|