diff options
author | 2014-12-16 07:41:37 -0800 | |
---|---|---|
committer | 2014-12-16 07:41:37 -0800 | |
commit | 86f032832fc3527ab561bcbd9d2a546f7f676f73 (patch) | |
tree | 01fb6a7da4aef332c11a271e6bd3f889193a7b5f /src/gpu/GrLayerHoister.h | |
parent | 861e1037017bbb7ac52ec5ebecab3a636a82a3e8 (diff) |
Revert of Fix layer hoisting image filter corner cases (patchset #3 id:40001 of https://codereview.chromium.org/803183003/)
Reason for revert:
Breaking DM
Original issue's description:
> Fix layer hoisting image filter corner cases
>
> This CL fixes 5 bugs related to hoisting image filters:
>
> For image filters the src layer (the one prior to filtering) often needs to be
> smaller then the final layer. This requires the saveLayer's optional bounds
> to be stored (in SkLayerInfo.h and SkRecordDraw.cpp) and then used in
> compute_source_rect and carried around in GrCachedLayer.
>
> The image filters can add an extra offset to the final draw operation.
> This is now computed in GrLayerHoister::FilterLayer and carried around in
> GrCachedLayer.
>
> Filtered layers must use exact matches. This is now done in GrLayerCache::lock.
>
> The filter cache requires a valid matrix so it can compute the correct offset.
> This is now done in GrLayerHoister::FilterLayer.
>
> Filtered layers need to be drawn with drawSprite while unfiltered (and therefore
> hopefully atlased) layers can be drawn with drawBitmap. This is now done in
> draw_replacement_bitmap.
>
> Committed: https://skia.googlesource.com/skia/+/702eb9622102599d94ab6798e6227cf29f48c2d3
TBR=bsalomon@google.com
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/790643009
Diffstat (limited to 'src/gpu/GrLayerHoister.h')
-rw-r--r-- | src/gpu/GrLayerHoister.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/GrLayerHoister.h b/src/gpu/GrLayerHoister.h index f30c53c038..9668ba60d5 100644 --- a/src/gpu/GrLayerHoister.h +++ b/src/gpu/GrLayerHoister.h @@ -108,9 +108,9 @@ private: /** Update the GrTexture in 'layer' with its filtered version @param context Owner of the layer cache (and thus the layers) @param device Required by the filtering code - @param info Layer info for a layer needing filtering prior to being composited + @param layer A layer needing filtering prior to being composited */ - static void FilterLayer(GrContext* context, SkGpuDevice* device, const GrHoistedLayer& info); + static void FilterLayer(GrContext* context, SkGpuDevice* device, GrCachedLayer* layer); }; |