Chromium Code Reviews| Index: cc/resources/resource.cc |
| diff --git a/cc/resources/resource.cc b/cc/resources/resource.cc |
| index 192eaebddc6d0c09fbf35619c8605f3144dff4ac..41dd535645a03e0dcacb07ef4b276ae24ac0f845 100644 |
| --- a/cc/resources/resource.cc |
| +++ b/cc/resources/resource.cc |
| @@ -11,14 +11,16 @@ size_t Resource::bytes() const { |
| if (size_.IsEmpty()) |
| return 0; |
| - return MemorySizeBytes(size_, format_); |
| + return MemorySizeBytes(size_, format_, is_16_bit_resource_); |
|
vangelis
2013/09/10 01:52:19
It would be cleaner if this parameter was a bytes_
kaanb
2013/09/11 04:01:52
I changed it to be the texture type.
|
| } |
| -size_t Resource::BytesPerPixel(GLenum format) { |
| +size_t Resource::BytesPerPixel(GLenum format, bool is_16_bit_resource) { |
| size_t components_per_pixel = 0; |
| size_t bytes_per_component = 1; |
| switch (format) { |
| case GL_RGBA: |
| + components_per_pixel = (is_16_bit_resource) ? 2 : 4; |
|
vangelis
2013/09/10 01:52:19
I think what you want to change here is the bytes_
kaanb
2013/09/11 04:01:52
Yes, moved this method to ResourceProvider and I r
|
| + break; |
| case GL_BGRA_EXT: |
| components_per_pixel = 4; |
| break; |
| @@ -31,8 +33,10 @@ size_t Resource::BytesPerPixel(GLenum format) { |
| return components_per_pixel * bytes_per_component; |
| } |
| -size_t Resource::MemorySizeBytes(gfx::Size size, GLenum format) { |
| - return BytesPerPixel(format) * size.width() * size.height(); |
| +size_t Resource::MemorySizeBytes( |
| + gfx::Size size, GLenum format, bool is_16_bit_resource) { |
| + return |
| + BytesPerPixel(format, is_16_bit_resource) * size.width() * size.height(); |
| } |