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

Unified Diff: cc/scheduler/texture_uploader.cc

Issue 41903003: cc: Fix incomplete changes to add ETC1 support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed compilation issues Created 7 years, 1 month 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/ui_resource_bitmap.cc ('k') | cc/trees/layer_tree_host_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/scheduler/texture_uploader.cc
diff --git a/cc/scheduler/texture_uploader.cc b/cc/scheduler/texture_uploader.cc
index 91d80474ce0684e9f6737620066a4f3fc937dc6d..54d351527d690821ea0a7c33c1ca93707a64a937 100644
--- a/cc/scheduler/texture_uploader.cc
+++ b/cc/scheduler/texture_uploader.cc
@@ -147,14 +147,14 @@ void TextureUploader::Upload(const uint8* image,
// ETC1 does not support subimage uploads.
DCHECK(is_full_upload);
UploadWithTexImageETC1(image, size);
- return;
- }
-
- if (use_map_tex_sub_image_) {
- UploadWithMapTexSubImage(
- image, image_rect, source_rect, dest_offset, format);
} else {
- UploadWithTexSubImage(image, image_rect, source_rect, dest_offset, format);
+ if (use_map_tex_sub_image_) {
+ UploadWithMapTexSubImage(
+ image, image_rect, source_rect, dest_offset, format);
+ } else {
+ UploadWithTexSubImage(
+ image, image_rect, source_rect, dest_offset, format);
+ }
}
if (is_full_upload)
« no previous file with comments | « cc/resources/ui_resource_bitmap.cc ('k') | cc/trees/layer_tree_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698