From ce048626c1e0d2b9ca9a574bb2d7448d3f77147c Mon Sep 17 00:00:00 2001 From: engedy Date: Thu, 10 Dec 2015 04:41:29 -0800 Subject: Revert of Allow one-copy task tile worker pool to use compressed textures. (patchset #14 id:260001 of https://codereview.chromium.org/1379783002/ ) Reason for revert: Resulted in linux-release/sizes/chrome-si/initializers failure: https://build.chromium.org/p/chromium/builders/Mac/builds/9905 https://build.chromium.org/p/chromium/builders/Linux/builds/69200 26a27 > # texture_compressor_etc1_sse.cc _GLOBAL__sub_I_texture_compressor_etc1_sse.cc+0xb 29c30 < # Found 28 static initializers in 8 files. --- > # Found 29 static initializers in 9 files. If this is intended, please update corresponding performance test expectations. Original issue's description: > Allow one-copy and zero-copy task tile worker pools to use compressed textures. > > BUG=434699 > CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel > > Committed: https://crrev.com/7d60ce9a132a88ead407a2a58c91edc431e68259 > Cr-Commit-Position: refs/heads/master@{#364326} TBR=reveman@chromium.org,nyquist@chromium.org,piman@chromium.org,sievers@chromium.org,christiank@opera.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=434699 Review URL: https://codereview.chromium.org/1513733003 Cr-Commit-Position: refs/heads/master@{#364342} --- content/renderer/gpu/render_widget_compositor.cc | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) (limited to 'content/renderer') diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc index 6c2b12b..74aae79 100644 --- a/content/renderer/gpu/render_widget_compositor.cc +++ b/content/renderer/gpu/render_widget_compositor.cc @@ -405,16 +405,14 @@ void RenderWidgetCompositor::Initialize() { // low end, so always use default policy. bool use_low_memory_policy = base::SysInfo::IsLowEndDevice() && !using_synchronous_compositor; + // RGBA_4444 textures are only enabled by default for low end devices + // and are disabled for Android WebView as it doesn't support the format. + settings.renderer_settings.use_rgba_4444_textures = use_low_memory_policy; if (use_low_memory_policy) { // On low-end we want to be very carefull about killing other // apps. So initially we use 50% more memory to avoid flickering // or raster-on-demand. settings.max_memory_for_prepaint_percentage = 67; - - // RGBA_4444 textures are only enabled by default for low end devices - // and are disabled for Android WebView as it doesn't support the format. - if (!cmd->HasSwitch(switches::kDisableRGBA4444Textures)) - settings.renderer_settings.preferred_tile_format = cc::RGBA_4444; } else { // On other devices we have increased memory excessively to avoid // raster-on-demand already, so now we reserve 50% _only_ to avoid @@ -450,14 +448,10 @@ void RenderWidgetCompositor::Initialize() { if (cmd->HasSwitch(cc::switches::kEnableBeginFrameScheduling)) settings.use_external_begin_frame_source = true; - if (cmd->HasSwitch(switches::kEnableRGBA4444Textures) && - !cmd->HasSwitch(switches::kDisableRGBA4444Textures)) { - settings.renderer_settings.preferred_tile_format = cc::RGBA_4444; - } - - if (cmd->HasSwitch(cc::switches::kEnableTileCompression)) { - settings.renderer_settings.preferred_tile_format = cc::ETC1; - } + settings.renderer_settings.use_rgba_4444_textures |= + cmd->HasSwitch(switches::kEnableRGBA4444Textures); + settings.renderer_settings.use_rgba_4444_textures &= + !cmd->HasSwitch(switches::kDisableRGBA4444Textures); if (widget_->for_oopif()) { // TODO(simonhong): Apply BeginFrame scheduling for OOPIF. -- cgit v1.1