49df61f638
This is a reland of 805acda3f3
It fixes the #if SK_GL which was causing the Android roll
to fail.
This disables unit tests on Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-TSAN_Vulkan
which were consistently crashing with OOM.
Original change's description:
> [fuzzer] Remove GL from (now-Vulkan) build
>
> The fuzzer runs against the Vulkan version of Swiftshader.
> There are no libGL.so (etc) on the fuzz runtime, so we
> want to avoid linking against those.
>
> The GL code that is #ifdef'd out is still necessary to
> avoid timeouts on TSAN with our NVIDIA jobs.
> https://skia-review.googlesource.com/c/skia/+/502638
>
> Procedure for testing this locally (and iterating):
> 1. In oss-fuzz checkout, run
> `python infra/helper.py shell skia`
> to pull up local interactive version of Docker
> fuzzer build image.
> 2. Run `compile` in fuzzer shell. Stop after
> the swiftshader compiles and is copied into /out
> with Ctrl + C.
> 3. Comment out the swiftshader compilation part [1]
> (no need to re-do this when modifying Skia code).
> `apt-get install nano -y`
> `nano ../build.sh`
> 4. Make change to Skia repo using normal methods.
> 5. Run the following in the Skia repo
> `git diff origin main > foo.patch`
> Copy the patch into the Docker shell using Ctrl+C
> and nano.
> 6. Apply the patch inside the Docker shell
> `git apply foo.patch`
> and re-compile (which should skip right to
> building the fuzzer libs)
> `compile`
> 7. Repeat 4-7 or make small changes directly in
> the Docker shell via nano.
> 8. When compilation and link succeeds, run
> `ldd /out/api_mock_gpu_canvas`
> to verify GL and friends were not dynamically linked.
>
> [1] https://github.com/google/oss-fuzz/pull/7214/files#diff-76f13875e33875cdd372f1f0933206be599cd87952f1bd1eaa57ca928ee9e3e1R49-R53
>
> Change-Id: Idf569820527c1304b0e5a68fd36295be89dfa2a0
> Bug: oss-fuzz:44132
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/503016
> Reviewed-by: Brian Osman <brianosman@google.com>
> Commit-Queue: Kevin Lubick <kjlubick@google.com>
Bug: oss-fuzz:44132, skia:12900
Change-Id: Ia2eff9403b0035e7f86098f296d7d9b1bbfd4876
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/503716
Reviewed-by: John Stiles <johnstiles@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
178 lines
7.3 KiB
C++
178 lines
7.3 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/GrDirectContext.h"
|
|
#include "include/gpu/GrRecordingContext.h"
|
|
#include "src/gpu/GrDirectContextPriv.h"
|
|
#include "src/gpu/GrRecordingContextPriv.h"
|
|
#include "src/gpu/GrResourceCache.h"
|
|
#include "src/gpu/GrStyle.h"
|
|
#include "src/gpu/GrUserStencilSettings.h"
|
|
#include "src/gpu/effects/GrPorterDuffXferProcessor.h"
|
|
#include "src/gpu/geometry/GrStyledShape.h"
|
|
#include "src/gpu/ops/SoftwarePathRenderer.h"
|
|
#include "src/gpu/ops/TriangulatingPathRenderer.h"
|
|
#include "src/gpu/v1/SurfaceDrawContext_v1.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(GrRecordingContext* rContext,
|
|
skgpu::v1::SurfaceDrawContext* sdc,
|
|
const SkPath& path,
|
|
skgpu::v1::PathRenderer* pr,
|
|
GrAAType aaType,
|
|
const GrStyle& style,
|
|
float scaleX = 1.f) {
|
|
GrPaint paint;
|
|
paint.setXPFactory(GrPorterDuffXPFactory::Get(SkBlendMode::kSrc));
|
|
|
|
SkIRect clipConservativeBounds = SkIRect::MakeWH(sdc->width(),
|
|
sdc->height());
|
|
GrStyledShape shape(path, style);
|
|
if (shape.style().applies()) {
|
|
shape = shape.applyStyle(GrStyle::Apply::kPathEffectAndStrokeRec, 1.0f);
|
|
}
|
|
SkMatrix matrix = SkMatrix::I();
|
|
matrix.setScaleX(scaleX);
|
|
skgpu::v1::PathRenderer::DrawPathArgs args{rContext,
|
|
std::move(paint),
|
|
&GrUserStencilSettings::kUnused,
|
|
sdc,
|
|
nullptr,
|
|
&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<skgpu::v1::PathRenderer*(GrRecordingContext*)> makePathRenderer,
|
|
int expected,
|
|
bool checkListeners,
|
|
GrAAType aaType = GrAAType::kNone,
|
|
GrStyle style = GrStyle(SkStrokeRec::kFill_InitStyle)) {
|
|
sk_sp<GrDirectContext> dContext = GrDirectContext::MakeMock(nullptr);
|
|
// The cache needs to be big enough that nothing gets flushed, or our expectations can be wrong
|
|
dContext->setResourceCacheLimit(8000000);
|
|
GrResourceCache* cache = dContext->priv().getResourceCache();
|
|
|
|
auto sdc = skgpu::v1::SurfaceDrawContext::Make(
|
|
dContext.get(), GrColorType::kRGBA_8888, nullptr, SkBackingFit::kApprox, {800, 800},
|
|
SkSurfaceProps(), 1, GrMipmapped::kNo, GrProtected::kNo, kTopLeft_GrSurfaceOrigin);
|
|
if (!sdc) {
|
|
return;
|
|
}
|
|
|
|
sk_sp<skgpu::v1::PathRenderer> pathRenderer(makePathRenderer(dContext.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(dContext.get(), sdc.get(), path, pathRenderer.get(), aaType, style);
|
|
dContext->flushAndSubmit();
|
|
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(dContext.get(), sdc.get(), path, pathRenderer.get(), aaType, style, scaleX);
|
|
}
|
|
dContext->flushAndSubmit();
|
|
REPORTER_ASSERT(reporter, SkPathPriv::GenIDChangeListenersCount(path) == 20);
|
|
cache->purgeUnlockedResources();
|
|
// The listeners don't actually purge until we try to add another one.
|
|
draw_path(dContext.get(), sdc.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 = [](GrRecordingContext*) {
|
|
return new skgpu::v1::TriangulatingPathRenderer();
|
|
};
|
|
|
|
// 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 = [](GrRecordingContext* rContext) {
|
|
return new skgpu::v1::SoftwarePathRenderer(rContext->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 FillRectOp 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);
|
|
}
|