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

Unified Diff: cc/resources/resource_provider.cc

Issue 1379783002: Allow one-copy task tile worker pool to use compressed textures. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address nits Created 5 years 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 506d1d97954cd14f49c1a8422c5987a6519288c3..08b3f586e5c56df39b63d9f7fc9043be3796458c 100644
--- a/cc/resources/resource_provider.cc
+++ b/cc/resources/resource_provider.cc
@@ -368,6 +368,29 @@ ResourceProvider::~ResourceProvider() {
gl->Finish();
}
+bool ResourceProvider::IsResourceFormatSupported(ResourceFormat format) const {
+ const ContextProvider::Capabilities& caps =
+ output_surface_->context_provider()->ContextCapabilities();
+
+ switch (format) {
+ case ALPHA_8:
+ case RGBA_4444:
+ case RGBA_8888:
+ case RGB_565:
+ case LUMINANCE_8:
+ return true;
+ case BGRA_8888:
+ return caps.gpu.texture_format_bgra8888;
+ case ETC1:
+ return caps.gpu.texture_format_etc1;
+ case RED_8:
+ return caps.gpu.texture_rg;
+ }
+
+ NOTREACHED();
+ return false;
+}
+
bool ResourceProvider::InUseByConsumer(ResourceId id) {
Resource* resource = GetResource(id);
return resource->lock_for_read_count > 0 || resource->exported_count > 0 ||
@@ -1067,10 +1090,10 @@ void ResourceProvider::Initialize() {
max_texture_size_ = 0; // Context expects cleared value.
gl->GetIntegerv(GL_MAX_TEXTURE_SIZE, &max_texture_size_);
best_texture_format_ =
- PlatformColor::BestTextureFormat(use_texture_format_bgra_);
+ PlatformColor::BestSupportedTextureFormat(use_texture_format_bgra_);
- best_render_buffer_format_ =
- PlatformColor::BestTextureFormat(caps.gpu.render_buffer_format_bgra8888);
+ best_render_buffer_format_ = PlatformColor::BestSupportedTextureFormat(
+ caps.gpu.render_buffer_format_bgra8888);
texture_id_allocator_.reset(
new TextureIdAllocator(gl, id_allocation_chunk_size_));
@@ -1503,7 +1526,6 @@ void ResourceProvider::LazyAllocate(Resource* resource) {
LazyCreate(resource);
if (!resource->gl_id)
return;
- resource->allocated = true;
GLES2Interface* gl = ContextGL();
gfx::Size& size = resource->size;
ResourceFormat format = resource->format;
@@ -1523,12 +1545,14 @@ void ResourceProvider::LazyAllocate(Resource* resource) {
GLenum storage_format = TextureToStorageFormat(format);
gl->TexStorage2DEXT(resource->target, 1, storage_format, size.width(),
size.height());
+ resource->allocated = true;
} else {
// ETC1 does not support preallocation.
if (format != ETC1) {
gl->TexImage2D(resource->target, 0, GLInternalFormat(format),
size.width(), size.height(), 0, GLDataFormat(format),
GLDataType(format), NULL);
+ resource->allocated = true;
}
}
}

Powered by Google App Engine
This is Rietveld 408576698