| Index: cc/resources/resource_provider.h
|
| diff --git a/cc/resources/resource_provider.h b/cc/resources/resource_provider.h
|
| index bee3ce1014a0b1b610203c2d66c7be97077b17c4..375ed54e4ee3d806084eff709b3befd42bb04978 100644
|
| --- a/cc/resources/resource_provider.h
|
| +++ b/cc/resources/resource_provider.h
|
| @@ -88,7 +88,8 @@ class CC_EXPORT ResourceProvider
|
| int highp_threshold_min,
|
| bool use_rgba_4444_texture_format,
|
| size_t id_allocation_chunk_size,
|
| - bool use_persistent_map_for_gpu_memory_buffers);
|
| + bool use_persistent_map_for_gpu_memory_buffers,
|
| + const std::vector<unsigned>& use_image_texture_targets);
|
| ~ResourceProvider() override;
|
|
|
| void DidLoseOutputSurface() { lost_output_surface_ = true; }
|
| @@ -441,6 +442,8 @@ class CC_EXPORT ResourceProvider
|
|
|
| void ValidateResource(ResourceId id) const;
|
|
|
| + GLenum GetImageTextureTarget(ResourceFormat format);
|
| +
|
| // base::trace_event::MemoryDumpProvider implementation.
|
| bool OnMemoryDump(const base::trace_event::MemoryDumpArgs& args,
|
| base::trace_event::ProcessMemoryDump* pmd) override;
|
| @@ -453,7 +456,8 @@ class CC_EXPORT ResourceProvider
|
| int highp_threshold_min,
|
| bool use_rgba_4444_texture_format,
|
| size_t id_allocation_chunk_size,
|
| - bool use_persistent_map_for_gpu_memory_buffers);
|
| + bool use_persistent_map_for_gpu_memory_buffers,
|
| + const std::vector<unsigned>& use_image_texture_targets);
|
| void Initialize();
|
|
|
| private:
|
| @@ -611,6 +615,7 @@ class CC_EXPORT ResourceProvider
|
| bool use_persistent_map_for_gpu_memory_buffers_;
|
| // Fence used for CopyResource if CHROMIUM_sync_query is not supported.
|
| scoped_refptr<SynchronousFence> synchronous_fence_;
|
| + std::vector<unsigned> use_image_texture_targets_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ResourceProvider);
|
| };
|
|
|