2686d69bf0
This reverts commit73b86c1ade
. Reason for revert: wasn't the problem, relanding Original change's description: > Revert "Rename GrShape to GrStyledShape" > > This reverts commitf3f08af010
. > > Reason for revert: maybe this is breaking the ios perf bot; it is the first CL that caused the bot to fail, but I can't really say why this would break them. > > Original change's description: > > Rename GrShape to GrStyledShape > > > > Change-Id: Ic457e634b4b95356f5615cff3fce1ca7d7677c26 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/284036 > > Reviewed-by: Robert Phillips <robertphillips@google.com> > > Commit-Queue: Michael Ludwig <michaelludwig@google.com> > > TBR=bsalomon@google.com,robertphillips@google.com,michaelludwig@google.com > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Change-Id: I2e5adbfc820811fbbde9cb57af28f86a7ba40bd9 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/284231 > Reviewed-by: Michael Ludwig <michaelludwig@google.com> > Commit-Queue: Michael Ludwig <michaelludwig@google.com> TBR=bsalomon@google.com,robertphillips@google.com,michaelludwig@google.com Change-Id: Ifdd52f8bacb5d66a7bf58efd328675c4c443ac8a No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/284376 Reviewed-by: Michael Ludwig <michaelludwig@google.com> Commit-Queue: Michael Ludwig <michaelludwig@google.com>
176 lines
6.9 KiB
C++
176 lines
6.9 KiB
C++
/*
|
|
* Copyright 2017 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "tests/Test.h"
|
|
|
|
#include "include/core/SkPath.h"
|
|
#include "include/gpu/GrContext.h"
|
|
#include "src/gpu/GrClip.h"
|
|
#include "src/gpu/GrContextPriv.h"
|
|
#include "src/gpu/GrResourceCache.h"
|
|
#include "src/gpu/GrSoftwarePathRenderer.h"
|
|
#include "src/gpu/GrStyle.h"
|
|
#include "src/gpu/effects/GrPorterDuffXferProcessor.h"
|
|
#include "src/gpu/geometry/GrStyledShape.h"
|
|
#include "src/gpu/ops/GrTriangulatingPathRenderer.h"
|
|
|
|
static SkPath create_concave_path() {
|
|
SkPath path;
|
|
path.moveTo(100, 0);
|
|
path.lineTo(200, 200);
|
|
path.lineTo(100, 150);
|
|
path.lineTo(0, 200);
|
|
path.close();
|
|
return path;
|
|
}
|
|
|
|
static void draw_path(GrContext* ctx,
|
|
GrRenderTargetContext* renderTargetContext,
|
|
const SkPath& path,
|
|
GrPathRenderer* pr,
|
|
GrAAType aaType,
|
|
const GrStyle& style,
|
|
float scaleX = 1.f) {
|
|
GrPaint paint;
|
|
paint.setXPFactory(GrPorterDuffXPFactory::Get(SkBlendMode::kSrc));
|
|
|
|
GrNoClip noClip;
|
|
SkIRect clipConservativeBounds = SkIRect::MakeWH(renderTargetContext->width(),
|
|
renderTargetContext->height());
|
|
GrStyledShape shape(path, style);
|
|
if (shape.style().applies()) {
|
|
shape = shape.applyStyle(GrStyle::Apply::kPathEffectAndStrokeRec, 1.0f);
|
|
}
|
|
SkMatrix matrix = SkMatrix::I();
|
|
matrix.setScaleX(scaleX);
|
|
GrPathRenderer::DrawPathArgs args{ctx,
|
|
std::move(paint),
|
|
&GrUserStencilSettings::kUnused,
|
|
renderTargetContext,
|
|
&noClip,
|
|
&clipConservativeBounds,
|
|
&matrix,
|
|
&shape,
|
|
aaType,
|
|
false};
|
|
pr->drawPath(args);
|
|
}
|
|
|
|
static bool cache_non_scratch_resources_equals(GrResourceCache* cache, int expected) {
|
|
#if GR_CACHE_STATS
|
|
GrResourceCache::Stats stats;
|
|
cache->getStats(&stats);
|
|
return (stats.fTotal - stats.fScratch) == expected;
|
|
#else
|
|
return true;
|
|
#endif
|
|
}
|
|
|
|
static void test_path(skiatest::Reporter* reporter,
|
|
std::function<SkPath(void)> createPath,
|
|
std::function<GrPathRenderer*(GrContext*)> createPathRenderer,
|
|
int expected,
|
|
bool checkListeners,
|
|
GrAAType aaType = GrAAType::kNone,
|
|
GrStyle style = GrStyle(SkStrokeRec::kFill_InitStyle)) {
|
|
sk_sp<GrContext> ctx = GrContext::MakeMock(nullptr);
|
|
// The cache needs to be big enough that nothing gets flushed, or our expectations can be wrong
|
|
ctx->setResourceCacheLimit(8000000);
|
|
GrResourceCache* cache = ctx->priv().getResourceCache();
|
|
|
|
auto rtc = GrRenderTargetContext::Make(
|
|
ctx.get(), GrColorType::kRGBA_8888, nullptr, SkBackingFit::kApprox, {800, 800}, 1,
|
|
GrMipMapped::kNo, GrProtected::kNo, kTopLeft_GrSurfaceOrigin);
|
|
if (!rtc) {
|
|
return;
|
|
}
|
|
|
|
sk_sp<GrPathRenderer> pathRenderer(createPathRenderer(ctx.get()));
|
|
SkPath path = createPath();
|
|
|
|
// Initially, cache only has the render target context
|
|
REPORTER_ASSERT(reporter, cache_non_scratch_resources_equals(cache, 0));
|
|
|
|
// Draw the path, check that new resource count matches expectations
|
|
draw_path(ctx.get(), rtc.get(), path, pathRenderer.get(), aaType, style);
|
|
ctx->flush();
|
|
REPORTER_ASSERT(reporter, cache_non_scratch_resources_equals(cache, expected));
|
|
|
|
// Nothing should be purgeable yet
|
|
cache->purgeAsNeeded();
|
|
REPORTER_ASSERT(reporter, cache_non_scratch_resources_equals(cache, expected));
|
|
|
|
// Reset the path to change the GenID, which should invalidate one resource in the cache.
|
|
// Some path renderers may leave other unique-keyed resources in the cache, though.
|
|
path.reset();
|
|
cache->purgeAsNeeded();
|
|
REPORTER_ASSERT(reporter, cache_non_scratch_resources_equals(cache, expected - 1));
|
|
|
|
if (!checkListeners) {
|
|
return;
|
|
}
|
|
|
|
// Test that purging the cache of masks also removes listeners from the path.
|
|
path = createPath();
|
|
REPORTER_ASSERT(reporter, SkPathPriv::GenIDChangeListenersCount(path) == 0);
|
|
for (int i = 0; i < 20; ++i) {
|
|
float scaleX = 1 + ((float)i + 1)/20.f;
|
|
draw_path(ctx.get(), rtc.get(), path, pathRenderer.get(), aaType, style, scaleX);
|
|
}
|
|
ctx->flush();
|
|
REPORTER_ASSERT(reporter, SkPathPriv::GenIDChangeListenersCount(path) == 20);
|
|
cache->purgeAllUnlocked();
|
|
// The listeners don't actually purge until we try to add another one.
|
|
draw_path(ctx.get(), rtc.get(), path, pathRenderer.get(), aaType, style);
|
|
REPORTER_ASSERT(reporter, SkPathPriv::GenIDChangeListenersCount(path) == 1);
|
|
}
|
|
|
|
// Test that deleting the original path invalidates the VBs cached by the tessellating path renderer
|
|
DEF_GPUTEST(TriangulatingPathRendererCacheTest, reporter, /* options */) {
|
|
auto createPR = [](GrContext*) {
|
|
return new GrTriangulatingPathRenderer();
|
|
};
|
|
|
|
// Triangulating path renderer creates a single vertex buffer for non-AA paths. No other
|
|
// resources should be created.
|
|
const int kExpectedResources = 1;
|
|
|
|
test_path(reporter, create_concave_path, createPR, kExpectedResources, false);
|
|
|
|
// Test with a style that alters the path geometry. This needs to attach the invalidation logic
|
|
// to the original path, not the modified path produced by the style.
|
|
SkPaint paint;
|
|
paint.setStyle(SkPaint::kStroke_Style);
|
|
paint.setStrokeWidth(1);
|
|
GrStyle style(paint);
|
|
test_path(reporter, create_concave_path, createPR, kExpectedResources, false, GrAAType::kNone,
|
|
style);
|
|
}
|
|
|
|
// Test that deleting the original path invalidates the textures cached by the SW path renderer
|
|
DEF_GPUTEST(SoftwarePathRendererCacheTest, reporter, /* options */) {
|
|
auto createPR = [](GrContext* ctx) {
|
|
return new GrSoftwarePathRenderer(ctx->priv().proxyProvider(), true);
|
|
};
|
|
|
|
// Software path renderer creates a mask texture and renders with a non-AA rect, but the flush
|
|
// only contains a single quad so GrFillRectOp doesn't need to use the shared index buffer.
|
|
const int kExpectedResources = 1;
|
|
|
|
test_path(reporter, create_concave_path, createPR, kExpectedResources, true,
|
|
GrAAType::kCoverage);
|
|
|
|
// Test with a style that alters the path geometry. This needs to attach the invalidation logic
|
|
// to the original path, not the modified path produced by the style.
|
|
SkPaint paint;
|
|
paint.setStyle(SkPaint::kStroke_Style);
|
|
paint.setStrokeWidth(1);
|
|
GrStyle style(paint);
|
|
test_path(reporter, create_concave_path, createPR, kExpectedResources, true,
|
|
GrAAType::kCoverage, style);
|
|
}
|