a872718e51
This reverts commit814652c373. Reason for revert: missed suppression has landed in chrome Original change's description: > Revert "Preserve base device origin on saveLayer and image filters" > > This reverts commitf436cf2343. > > Reason for revert: May need to be behind flag or more > suppressions. Breaking linux-rel vulkan_swiftshader_blink_web_tests > css3/filters/effect-blur-hw.html . > > Original change's description: > > Preserve base device origin on saveLayer and image filters > > > > SaveLayerOriginTest taken from https://skia-review.googlesource.com/c/skia/+/277977 > > > > Bug: skia:12732 > > Change-Id: I5ce75355bb16237043c229e1cbc7a106eb636d18 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/508919 > > Reviewed-by: Greg Daniel <egdaniel@google.com> > > Commit-Queue: Michael Ludwig <michaelludwig@google.com> > > Bug: skia:12732 > Change-Id: I74cc8dc279d22c4fbd313ae3caeb4d0748daf003 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/510196 > Auto-Submit: Ben Wagner <bungeman@google.com> > Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Bug: skia:12732 Change-Id: Ifdc3ac96b1b695c208960915ca313fbacf4b7ed6 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/510203 Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Auto-Submit: Michael Ludwig <michaelludwig@google.com> Reviewed-by: Ben Wagner <bungeman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
95 lines
3.1 KiB
C++
95 lines
3.1 KiB
C++
/*
|
|
* Copyright 2016 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file
|
|
*/
|
|
|
|
#include "include/core/SkBitmap.h"
|
|
#include "include/core/SkCanvas.h"
|
|
#include "include/gpu/GrDirectContext.h"
|
|
#include "src/core/SkSpecialImage.h"
|
|
#include "src/core/SkSpecialSurface.h"
|
|
#include "src/gpu/GrCaps.h"
|
|
#include "src/gpu/GrDirectContextPriv.h"
|
|
#include "src/gpu/SkGr.h"
|
|
#include "tests/Test.h"
|
|
|
|
class TestingSpecialSurfaceAccess {
|
|
public:
|
|
static const SkIRect& Subset(const SkSpecialSurface* surf) {
|
|
return surf->subset();
|
|
}
|
|
};
|
|
|
|
// Both 'kSmallerSize' and 'kFullSize' need to be a non-power-of-2 to exercise
|
|
// the gpu's loose fit behavior
|
|
static const int kSmallerSize = 10;
|
|
static const int kPad = 5;
|
|
static const int kFullSize = kSmallerSize + 2 * kPad;
|
|
|
|
// Exercise the public API of SkSpecialSurface (e.g., getCanvas, newImageSnapshot)
|
|
static void test_surface(const sk_sp<SkSpecialSurface>& surf,
|
|
skiatest::Reporter* reporter,
|
|
int offset) {
|
|
|
|
const SkIRect surfSubset = TestingSpecialSurfaceAccess::Subset(surf.get());
|
|
REPORTER_ASSERT(reporter, offset == surfSubset.fLeft);
|
|
REPORTER_ASSERT(reporter, offset == surfSubset.fTop);
|
|
REPORTER_ASSERT(reporter, kSmallerSize == surfSubset.width());
|
|
REPORTER_ASSERT(reporter, kSmallerSize == surfSubset.height());
|
|
|
|
SkCanvas* canvas = surf->getCanvas();
|
|
SkASSERT_RELEASE(canvas);
|
|
|
|
canvas->clear(SK_ColorRED);
|
|
|
|
sk_sp<SkSpecialImage> img(surf->makeImageSnapshot());
|
|
REPORTER_ASSERT(reporter, img);
|
|
|
|
const SkIRect imgSubset = img->subset();
|
|
REPORTER_ASSERT(reporter, surfSubset == imgSubset);
|
|
|
|
// the canvas was invalidated by the newImageSnapshot call
|
|
REPORTER_ASSERT(reporter, !surf->getCanvas());
|
|
}
|
|
|
|
DEF_TEST(SpecialSurface_Raster, reporter) {
|
|
|
|
SkImageInfo info = SkImageInfo::MakeN32(kSmallerSize, kSmallerSize, kOpaque_SkAlphaType);
|
|
sk_sp<SkSpecialSurface> surf(SkSpecialSurface::MakeRaster(info, SkSurfaceProps()));
|
|
|
|
test_surface(surf, reporter, 0);
|
|
}
|
|
|
|
DEF_TEST(SpecialSurface_Raster2, reporter) {
|
|
|
|
SkBitmap bm;
|
|
bm.allocN32Pixels(kFullSize, kFullSize, true);
|
|
|
|
const SkIRect subset = SkIRect::MakeXYWH(kPad, kPad, kSmallerSize, kSmallerSize);
|
|
|
|
sk_sp<SkSpecialSurface> surf(SkSpecialSurface::MakeFromBitmap(subset, bm, SkSurfaceProps()));
|
|
|
|
test_surface(surf, reporter, kPad);
|
|
|
|
// TODO: check that the clear didn't escape the active region
|
|
}
|
|
|
|
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SpecialSurface_Gpu1, reporter, ctxInfo) {
|
|
auto dContext = ctxInfo.directContext();
|
|
|
|
for (auto colorType : { kRGBA_8888_SkColorType, kRGBA_1010102_SkColorType }) {
|
|
if (!dContext->colorTypeSupportedAsSurface(colorType)) {
|
|
continue;
|
|
}
|
|
|
|
SkImageInfo ii = SkImageInfo::Make({ kSmallerSize, kSmallerSize }, colorType,
|
|
kPremul_SkAlphaType);
|
|
|
|
auto surf(SkSpecialSurface::MakeRenderTarget(dContext, ii, SkSurfaceProps(),
|
|
kTopLeft_GrSurfaceOrigin));
|
|
test_surface(surf, reporter, 0);
|
|
}
|
|
}
|