Index: cc/resources/resource_provider.h |
diff --git a/cc/resources/resource_provider.h b/cc/resources/resource_provider.h |
index 4f38ca95f89b183545fd4d72642ee2d3a24b2518..3b291304c4be129585199f7b690a391e0b42ba20 100644 |
--- a/cc/resources/resource_provider.h |
+++ b/cc/resources/resource_provider.h |
@@ -27,6 +27,7 @@ |
#include "cc/base/resource_id.h" |
#include "cc/output/context_provider.h" |
#include "cc/output/output_surface.h" |
+#include "cc/output/renderer_settings.h" |
#include "cc/resources/release_callback_impl.h" |
#include "cc/resources/resource_format.h" |
#include "cc/resources/return_callback.h" |
@@ -93,7 +94,8 @@ class CC_EXPORT ResourceProvider |
size_t id_allocation_chunk_size, |
bool delegated_sync_points_required, |
bool use_gpu_memory_buffer_resources, |
- const std::vector<unsigned>& use_image_texture_targets); |
+ const RendererSettings::ImageTextureTargetsMap& |
+ use_image_texture_targets); |
~ResourceProvider() override; |
void Initialize(); |
@@ -475,7 +477,7 @@ class CC_EXPORT ResourceProvider |
void ValidateResource(ResourceId id) const; |
- GLenum GetImageTextureTarget(ResourceFormat format); |
+ GLenum GetImageTextureTarget(gfx::BufferUsage usage, ResourceFormat format); |
// base::trace_event::MemoryDumpProvider implementation. |
bool OnMemoryDump(const base::trace_event::MemoryDumpArgs& args, |
@@ -692,7 +694,7 @@ class CC_EXPORT ResourceProvider |
std::unique_ptr<IdAllocator> buffer_id_allocator_; |
bool use_sync_query_; |
- std::vector<unsigned> use_image_texture_targets_; |
+ RendererSettings::ImageTextureTargetsMap use_image_texture_targets_; |
// A process-unique ID used for disambiguating memory dumps from different |
// resource providers. |