Commit bb57d0bd authored by Antoine Labour's avatar Antoine Labour Committed by Commit Bot

Revert "Avoid checking overlay ResourcePool in non CA Layer"

This reverts commit afd24343.

Reason for revert: Caused a memory regression on Mac, for some reason: https://bugs.chromium.org/p/chromium/issues/detail?id=771766

Original change's description:
> Avoid checking overlay ResourcePool in non CA Layer
> 
> Overlay ResourcePool is only used for CA layer.
> BUG=None
> 
> Change-Id: Id37572e65d1b7a2c3307fa80be9820a94d693f7a
> Reviewed-on: https://chromium-review.googlesource.com/685947
> Reviewed-by: Antoine Labour <piman@chromium.org>
> Commit-Queue: Xing Xu <xing.xu@intel.com>
> Cr-Commit-Position: refs/heads/master@{#505913}

TBR=xing.xu@intel.com,piman@chromium.org,danakj@google.com

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: None
Change-Id: I0543fa78a715438d9d27c9eb38f643008745679f
Reviewed-on: https://chromium-review.googlesource.com/703714Reviewed-by: default avatarAntoine Labour <piman@chromium.org>
Commit-Queue: Antoine Labour <piman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506907}
parent da77427d
......@@ -3375,7 +3375,12 @@ void GLRenderer::ScheduleCALayers() {
}
void GLRenderer::ScheduleDCLayers() {
if (overlay_resource_pool_) {
overlay_resource_pool_->CheckBusyResources();
}
scoped_refptr<DCLayerOverlaySharedState> shared_state;
size_t copied_render_pass_count = 0;
for (DCLayerOverlay& dc_layer_overlay :
current_frame()->dc_layer_overlay_list) {
DCHECK(!dc_layer_overlay.rpdq);
......@@ -3430,6 +3435,13 @@ void GLRenderer::ScheduleDCLayers() {
dc_layer_overlay.edge_aa_mask, bounds_rect,
filter);
}
// Take the number of copied render passes in this frame, and use 3 times that
// amount as the cache limit.
if (overlay_resource_pool_) {
overlay_resource_pool_->SetResourceUsageLimits(
std::numeric_limits<std::size_t>::max(), copied_render_pass_count * 5);
}
}
void GLRenderer::ScheduleOverlays() {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment