diff options
| author | kaanb@chromium.org <kaanb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-19 05:05:14 +0000 |
|---|---|---|
| committer | kaanb@chromium.org <kaanb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-19 05:05:14 +0000 |
| commit | 27a41fe44f2c76b55e75d351cd3b75d0e7aabdd7 (patch) | |
| tree | 74954f5cb00293c37c51f30b822ebc067aa9e81e /cc/resources/resource_pool.cc | |
| parent | 16f2110ab00d1c05dc775b4a406e08525fb44c86 (diff) | |
| download | chromium_src-27a41fe44f2c76b55e75d351cd3b75d0e7aabdd7.zip chromium_src-27a41fe44f2c76b55e75d351cd3b75d0e7aabdd7.tar.gz chromium_src-27a41fe44f2c76b55e75d351cd3b75d0e7aabdd7.tar.bz2 | |
cc: Reland r233830. "Adding support for RGBA_4444 tile textures". r223830 had a bug in async_pixel_transfer_manager_egl.cc that wasn't directly related to the 4444 support. This patch includes the rest of the files in r223830. Changes to async_pixel_transfer_manager_egl.cc have been moved to the separate patch after fixing the bug: https://codereview.chromium.org/23533067/
BUG=272539
Review URL: https://chromiumcodereview.appspot.com/23447048
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224040 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/resources/resource_pool.cc')
| -rw-r--r-- | cc/resources/resource_pool.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cc/resources/resource_pool.cc b/cc/resources/resource_pool.cc index 75f7d1e..cef86de 100644 --- a/cc/resources/resource_pool.cc +++ b/cc/resources/resource_pool.cc @@ -10,12 +10,12 @@ namespace cc { ResourcePool::Resource::Resource(cc::ResourceProvider* resource_provider, gfx::Size size, - GLenum format) + ResourceFormat format) : cc::Resource(resource_provider->CreateManagedResource( size, - format, GL_CLAMP_TO_EDGE, - ResourceProvider::TextureUsageAny), + ResourceProvider::TextureUsageAny, + format), size, format), resource_provider_(resource_provider) { @@ -43,7 +43,7 @@ ResourcePool::~ResourcePool() { } scoped_ptr<ResourcePool::Resource> ResourcePool::AcquireResource( - gfx::Size size, GLenum format) { + gfx::Size size, ResourceFormat format) { for (ResourceList::iterator it = unused_resources_.begin(); it != unused_resources_.end(); ++it) { Resource* resource = *it; |