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

Unified Diff: cc/resources/resource_provider.cc

Issue 486853002: cc: Use a normal texture for background texture. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
Index: cc/resources/resource_provider.cc
diff --git a/cc/resources/resource_provider.cc b/cc/resources/resource_provider.cc
index fc31e004dece6bf401f7399e1c61aeb9a9ccb1a9..675f14ccab1140ea8e5b0866077e9c91839255f6 100644
--- a/cc/resources/resource_provider.cc
+++ b/cc/resources/resource_provider.cc
@@ -257,7 +257,7 @@ ResourceProvider::Resource::Resource()
bound_image_id(0),
texture_pool(0),
wrap_mode(0),
- hint(TextureUsageAny),
+ hint(TextureHintImmutable),
type(InvalidType),
format(RGBA_8888),
shared_bitmap(NULL) {
@@ -272,7 +272,7 @@ ResourceProvider::Resource::Resource(GLuint texture_id,
GLenum filter,
GLenum texture_pool,
GLint wrap_mode,
- TextureUsageHint hint,
+ TextureHint hint,
ResourceFormat format)
: child_id(0),
gl_id(texture_id),
@@ -346,7 +346,7 @@ ResourceProvider::Resource::Resource(uint8_t* pixels,
bound_image_id(0),
texture_pool(0),
wrap_mode(wrap_mode),
- hint(TextureUsageAny),
+ hint(TextureHintImmutable),
type(Bitmap),
format(RGBA_8888),
shared_bitmap(bitmap) {
@@ -390,7 +390,7 @@ ResourceProvider::Resource::Resource(const SharedBitmapId& bitmap_id,
bound_image_id(0),
texture_pool(0),
wrap_mode(wrap_mode),
- hint(TextureUsageAny),
+ hint(TextureHintImmutable),
type(Bitmap),
format(RGBA_8888),
shared_bitmap_id(bitmap_id),
@@ -638,7 +638,7 @@ bool ResourceProvider::AllowOverlay(ResourceId id) {
ResourceProvider::ResourceId ResourceProvider::CreateResource(
const gfx::Size& size,
GLint wrap_mode,
- TextureUsageHint hint,
+ TextureHint hint,
ResourceFormat format) {
DCHECK(!size.IsEmpty());
switch (default_resource_type_) {
@@ -664,7 +664,7 @@ ResourceProvider::ResourceId ResourceProvider::CreateManagedResource(
const gfx::Size& size,
GLenum target,
GLint wrap_mode,
- TextureUsageHint hint,
+ TextureHint hint,
ResourceFormat format) {
DCHECK(!size.IsEmpty());
switch (default_resource_type_) {
@@ -691,7 +691,7 @@ ResourceProvider::ResourceId ResourceProvider::CreateGLTexture(
GLenum target,
GLenum texture_pool,
GLint wrap_mode,
- TextureUsageHint hint,
+ TextureHint hint,
ResourceFormat format) {
DCHECK_LE(size.width(), max_texture_size_);
DCHECK_LE(size.height(), max_texture_size_);
@@ -750,7 +750,7 @@ ResourceProvider::ResourceId ResourceProvider::CreateResourceFromIOSurface(
GL_LINEAR,
GL_TEXTURE_POOL_UNMANAGED_CHROMIUM,
GL_CLAMP_TO_EDGE,
- TextureUsageAny,
+ TextureHintImmutable,
RGBA_8888);
LazyCreate(&resource);
GLES2Interface* gl = ContextGL();
@@ -779,7 +779,7 @@ ResourceProvider::ResourceId ResourceProvider::CreateResourceFromTextureMailbox(
GL_LINEAR,
0,
GL_CLAMP_TO_EDGE,
- TextureUsageAny,
+ TextureHintImmutable,
RGBA_8888);
} else {
DCHECK(mailbox.IsSharedMemory());
@@ -1427,7 +1427,7 @@ void ResourceProvider::ReceiveFromChild(
it->filter,
0,
it->is_repeated ? GL_REPEAT : GL_CLAMP_TO_EDGE,
- TextureUsageAny,
+ TextureHintImmutable,
it->format);
resource.mailbox = TextureMailbox(it->mailbox_holder.mailbox,
it->mailbox_holder.texture_target,
@@ -2055,7 +2055,7 @@ void ResourceProvider::LazyCreate(Resource* resource) {
GLC(gl,
gl->TexParameteri(
resource->target, GL_TEXTURE_POOL_CHROMIUM, resource->texture_pool));
- if (use_texture_usage_hint_ && resource->hint == TextureUsageFramebuffer) {
+ if (use_texture_usage_hint_ && resource->hint == TextureHintFramebuffer) {
GLC(gl,
gl->TexParameteri(resource->target,
GL_TEXTURE_USAGE_ANGLE,
@@ -2081,7 +2081,7 @@ void ResourceProvider::LazyAllocate(Resource* resource) {
ResourceFormat format = resource->format;
GLC(gl, gl->BindTexture(GL_TEXTURE_2D, resource->gl_id));
if (use_texture_storage_ext_ && IsFormatSupportedForStorage(format) &&
- resource->hint != TextureUsageFramebuffer) {
+ resource->hint == TextureHintImmutable) {
GLenum storage_format = TextureToStorageFormat(format);
GLC(gl,
gl->TexStorage2DEXT(

Powered by Google App Engine
This is Rietveld 408576698