Index: cc/resources/resource_provider.h |
diff --git a/cc/resources/resource_provider.h b/cc/resources/resource_provider.h |
index dfbff556028847bcf31f4f787814776ec6081e95..77b2eaba8050656850066ba670b6a850bbeb732f 100644 |
--- a/cc/resources/resource_provider.h |
+++ b/cc/resources/resource_provider.h |
@@ -60,9 +60,10 @@ class CC_EXPORT ResourceProvider { |
typedef std::vector<ResourceId> ResourceIdArray; |
typedef std::set<ResourceId> ResourceIdSet; |
typedef base::hash_map<ResourceId, ResourceId> ResourceIdMap; |
- enum TextureUsageHint { |
- TextureUsageAny, |
- TextureUsageFramebuffer, |
+ enum TextureHint { |
+ TextureHintDefault, |
+ TextureHintImmutable, |
+ TextureHintFramebuffer, |
}; |
enum ResourceType { |
InvalidType = 0, |
@@ -106,7 +107,7 @@ class CC_EXPORT ResourceProvider { |
// Creates a resource of the default resource type. |
ResourceId CreateResource(const gfx::Size& size, |
GLint wrap_mode, |
- TextureUsageHint hint, |
+ TextureHint hint, |
ResourceFormat format); |
// Creates a resource which is tagged as being managed for GPU memory |
@@ -114,7 +115,7 @@ class CC_EXPORT ResourceProvider { |
ResourceId CreateManagedResource(const gfx::Size& size, |
GLenum target, |
GLint wrap_mode, |
- TextureUsageHint hint, |
+ TextureHint hint, |
ResourceFormat format); |
// You can also explicitly create a specific resource type. |
@@ -122,7 +123,7 @@ class CC_EXPORT ResourceProvider { |
GLenum target, |
GLenum texture_pool, |
GLint wrap_mode, |
- TextureUsageHint hint, |
+ TextureHint hint, |
ResourceFormat format); |
ResourceId CreateBitmap(const gfx::Size& size, GLint wrap_mode); |
@@ -387,7 +388,7 @@ class CC_EXPORT ResourceProvider { |
GLenum filter, |
GLenum texture_pool, |
GLint wrap_mode, |
- TextureUsageHint hint, |
+ TextureHint hint, |
ResourceFormat format); |
Resource(uint8_t* pixels, |
SharedBitmap* bitmap, |
@@ -436,7 +437,7 @@ class CC_EXPORT ResourceProvider { |
unsigned bound_image_id; |
GLenum texture_pool; |
GLint wrap_mode; |
- TextureUsageHint hint; |
+ TextureHint hint; |
ResourceType type; |
ResourceFormat format; |
SharedBitmapId shared_bitmap_id; |