diff options
author | robertphillips <robertphillips@google.com> | 2014-12-16 07:41:37 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-12-16 07:41:37 -0800 |
commit | 86f032832fc3527ab561bcbd9d2a546f7f676f73 (patch) | |
tree | 01fb6a7da4aef332c11a271e6bd3f889193a7b5f /tests | |
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 'tests')
-rw-r--r-- | tests/GpuLayerCacheTest.cpp | 1 | ||||
-rw-r--r-- | tests/RecordReplaceDrawTest.cpp | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/tests/GpuLayerCacheTest.cpp b/tests/GpuLayerCacheTest.cpp index 6b3084b641..a149c367a0 100644 --- a/tests/GpuLayerCacheTest.cpp +++ b/tests/GpuLayerCacheTest.cpp @@ -43,7 +43,6 @@ static void create_layers(skiatest::Reporter* reporter, GrCachedLayer* layer = cache->findLayerOrCreate(picture.uniqueID(), idOffset+i+1, idOffset+i+2, SkIRect::MakeEmpty(), - SkIRect::MakeEmpty(), SkMatrix::I(), indices, 1, NULL); diff --git a/tests/RecordReplaceDrawTest.cpp b/tests/RecordReplaceDrawTest.cpp index bc63594fef..fd518fa177 100644 --- a/tests/RecordReplaceDrawTest.cpp +++ b/tests/RecordReplaceDrawTest.cpp @@ -114,7 +114,6 @@ void test_replacements(skiatest::Reporter* r, GrContext* context, bool useBBH) { GrLayerCache* layerCache = context->getLayerCache(); GrCachedLayer* layer = layerCache->findLayerOrCreate(pic->uniqueID(), 0, 2, SkIRect::MakeWH(kWidth, kHeight), - SkIRect::MakeWH(kWidth, kHeight), SkMatrix::I(), key, 1, &paint); GrSurfaceDesc desc; |