| Index: cc/resources/resource_provider.h
|
| diff --git a/cc/resources/resource_provider.h b/cc/resources/resource_provider.h
|
| index afabed7b8d8fcbc91c4278e70eab31e247cb7edb..d865f0a8f443ca3fdf52eed75e1d9a9ec1ed6ee8 100644
|
| --- a/cc/resources/resource_provider.h
|
| +++ b/cc/resources/resource_provider.h
|
| @@ -110,6 +110,7 @@ class CC_EXPORT ResourceProvider
|
| return best_render_buffer_format_;
|
| }
|
| ResourceFormat YuvResourceFormat(int bits) const;
|
| + ResourceFormat Y16ResourceFormat() const;
|
| bool use_sync_query() const { return use_sync_query_; }
|
| gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager() {
|
| return gpu_memory_buffer_manager_;
|
| @@ -227,6 +228,7 @@ class CC_EXPORT ResourceProvider
|
|
|
| unsigned texture_id() const { return texture_id_; }
|
| GLenum target() const { return target_; }
|
| + ResourceFormat format() const { return format_; }
|
| const gfx::Size& size() const { return size_; }
|
| const gfx::ColorSpace& color_space() const { return color_space_; }
|
|
|
| @@ -235,6 +237,7 @@ class CC_EXPORT ResourceProvider
|
| ResourceId resource_id_;
|
| unsigned texture_id_;
|
| GLenum target_;
|
| + ResourceFormat format_;
|
| gfx::Size size_;
|
| gfx::ColorSpace color_space_;
|
|
|
| @@ -254,6 +257,7 @@ class CC_EXPORT ResourceProvider
|
|
|
| unsigned texture_id() const { return resource_lock_.texture_id(); }
|
| GLenum target() const { return target_; }
|
| + ResourceFormat format() const { return resource_lock_.format(); }
|
| const gfx::ColorSpace& color_space() const {
|
| return resource_lock_.color_space();
|
| }
|
| @@ -699,6 +703,7 @@ class CC_EXPORT ResourceProvider
|
| bool use_compressed_texture_etc1_;
|
| ResourceFormat yuv_resource_format_;
|
| ResourceFormat yuv_highbit_resource_format_;
|
| + ResourceFormat y16_resource_format_;
|
| int max_texture_size_;
|
| ResourceFormat best_texture_format_;
|
| ResourceFormat best_render_buffer_format_;
|
|
|