Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(558)

Unified Diff: cc/resources/resource_provider.h

Issue 486853002: cc: Use a normal texture for background texture. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address nits in unittests Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/resources/raster_worker_pool_unittest.cc ('k') | cc/resources/resource_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/resource_provider.h
diff --git a/cc/resources/resource_provider.h b/cc/resources/resource_provider.h
index dfbff556028847bcf31f4f787814776ec6081e95..9bdc800d08d496ec0fcb5e19ff924c530ebe7945 100644
--- a/cc/resources/resource_provider.h
+++ b/cc/resources/resource_provider.h
@@ -60,9 +60,12 @@ 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 = 0x0,
+ TextureHintImmutable = 0x1,
+ TextureHintFramebuffer = 0x2,
+ TextureHintImmutableFramebuffer =
+ TextureHintImmutable | TextureHintFramebuffer
};
enum ResourceType {
InvalidType = 0,
@@ -106,7 +109,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 +117,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 +125,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 +390,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 +439,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;
« no previous file with comments | « cc/resources/raster_worker_pool_unittest.cc ('k') | cc/resources/resource_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698