diff options
author | engedy <engedy@chromium.org> | 2015-12-10 04:41:29 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-12-10 12:42:34 +0000 |
commit | ce048626c1e0d2b9ca9a574bb2d7448d3f77147c (patch) | |
tree | 20da25d832f34e0a6a62b2ccb5d84c0d6471bc59 /cc/output | |
parent | 5eb722fa5e9e3ac311f46923d0c6f84af5cf316a (diff) | |
download | chromium_src-ce048626c1e0d2b9ca9a574bb2d7448d3f77147c.zip chromium_src-ce048626c1e0d2b9ca9a574bb2d7448d3f77147c.tar.gz chromium_src-ce048626c1e0d2b9ca9a574bb2d7448d3f77147c.tar.bz2 |
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}
Diffstat (limited to 'cc/output')
-rw-r--r-- | cc/output/renderer_settings.cc | 17 | ||||
-rw-r--r-- | cc/output/renderer_settings.h | 3 | ||||
-rw-r--r-- | cc/output/renderer_settings_unittest.cc | 4 |
3 files changed, 9 insertions, 15 deletions
diff --git a/cc/output/renderer_settings.cc b/cc/output/renderer_settings.cc index 4c74710..da79a48 100644 --- a/cc/output/renderer_settings.cc +++ b/cc/output/renderer_settings.cc @@ -8,7 +8,6 @@ #include "base/logging.h" #include "cc/proto/renderer_settings.pb.h" -#include "cc/resources/platform_color.h" namespace cc { @@ -23,9 +22,9 @@ RendererSettings::RendererSettings() delay_releasing_overlay_resources(false), refresh_rate(60.0), highp_threshold_min(0), + use_rgba_4444_textures(false), texture_id_allocation_chunk_size(64), - use_gpu_memory_buffer_resources(false), - preferred_tile_format(PlatformColor::BestTextureFormat()) {} + use_gpu_memory_buffer_resources(false) {} RendererSettings::~RendererSettings() { } @@ -42,9 +41,9 @@ void RendererSettings::ToProtobuf(proto::RendererSettings* proto) const { delay_releasing_overlay_resources); proto->set_refresh_rate(refresh_rate); proto->set_highp_threshold_min(highp_threshold_min); + proto->set_use_rgba_4444_textures(use_rgba_4444_textures); proto->set_texture_id_allocation_chunk_size(texture_id_allocation_chunk_size); proto->set_use_gpu_memory_buffer_resources(use_gpu_memory_buffer_resources); - proto->set_preferred_tile_format(preferred_tile_format); } void RendererSettings::FromProtobuf(const proto::RendererSettings& proto) { @@ -58,13 +57,9 @@ void RendererSettings::FromProtobuf(const proto::RendererSettings& proto) { delay_releasing_overlay_resources = proto.delay_releasing_overlay_resources(); refresh_rate = proto.refresh_rate(); highp_threshold_min = proto.highp_threshold_min(); + use_rgba_4444_textures = proto.use_rgba_4444_textures(); texture_id_allocation_chunk_size = proto.texture_id_allocation_chunk_size(); use_gpu_memory_buffer_resources = proto.use_gpu_memory_buffer_resources(); - - DCHECK_LE(proto.preferred_tile_format(), - static_cast<uint32_t>(RESOURCE_FORMAT_MAX)); - preferred_tile_format = - static_cast<ResourceFormat>(proto.preferred_tile_format()); } bool RendererSettings::operator==(const RendererSettings& other) const { @@ -79,11 +74,11 @@ bool RendererSettings::operator==(const RendererSettings& other) const { other.delay_releasing_overlay_resources && refresh_rate == other.refresh_rate && highp_threshold_min == other.highp_threshold_min && + use_rgba_4444_textures == other.use_rgba_4444_textures && texture_id_allocation_chunk_size == other.texture_id_allocation_chunk_size && use_gpu_memory_buffer_resources == - other.use_gpu_memory_buffer_resources && - preferred_tile_format == other.preferred_tile_format; + other.use_gpu_memory_buffer_resources; } } // namespace cc diff --git a/cc/output/renderer_settings.h b/cc/output/renderer_settings.h index 3d7bf10..4910a25 100644 --- a/cc/output/renderer_settings.h +++ b/cc/output/renderer_settings.h @@ -7,7 +7,6 @@ #include "base/basictypes.h" #include "cc/base/cc_export.h" -#include "cc/resources/resource_format.h" namespace cc { @@ -30,9 +29,9 @@ class CC_EXPORT RendererSettings { bool delay_releasing_overlay_resources; double refresh_rate; int highp_threshold_min; + bool use_rgba_4444_textures; size_t texture_id_allocation_chunk_size; bool use_gpu_memory_buffer_resources; - ResourceFormat preferred_tile_format; void ToProtobuf(proto::RendererSettings* proto) const; void FromProtobuf(const proto::RendererSettings& proto); diff --git a/cc/output/renderer_settings_unittest.cc b/cc/output/renderer_settings_unittest.cc index 40d4f07..b7febd4 100644 --- a/cc/output/renderer_settings_unittest.cc +++ b/cc/output/renderer_settings_unittest.cc @@ -30,9 +30,9 @@ TEST(RendererSettingsTest, AllFieldsFlipped) { settings.delay_releasing_overlay_resources = true; settings.refresh_rate = 6.0; settings.highp_threshold_min = 1; + settings.use_rgba_4444_textures = true; settings.texture_id_allocation_chunk_size = 46; settings.use_gpu_memory_buffer_resources = true; - settings.preferred_tile_format = RGBA_4444; VerifySerializeAndDeserializeProto(settings); } @@ -48,9 +48,9 @@ TEST(RendererSettingsTest, ArbitraryFieldValues) { settings.delay_releasing_overlay_resources = true; settings.refresh_rate = 999.0; settings.highp_threshold_min = 1; + settings.use_rgba_4444_textures = true; settings.texture_id_allocation_chunk_size = 12; settings.use_gpu_memory_buffer_resources = true; - settings.preferred_tile_format = RGBA_4444; VerifySerializeAndDeserializeProto(settings); } |