4dca83162b
This CL is mostly mechanical. It:
replaces "src/gpu/GrSurfaceDrawContext.h" #includes with
"src/gpu/v1/SurfaceDrawContext_v1.h" and reorders
replaces "class GrSurfaceDrawContext;" with
"namespace skgpu { namespace v1 { class SurfaceDrawContext; }}"
replaces "GrSurfaceDrawContext*" with "auto" where possible
replaces "rtc" with "sdc"
replaces "surfaceDrawContext" with "sdc"
replaces GrSurfaceDrawContext with skgpu::v1::SurfaceDrawContext
reflows parameters as needed
This CL does not try to:
make skgpu::v1::SurfaceDrawContext V1-only
minimize the skgpu and/or skgpu::v1 prefixes
Those two tasks will be accomplished in follow up CLs. This CL is just trying to get the bulk of the mechanical changes comprehensibly landed.
Bug: skia:11837
Change-Id: I6fe59080249d585df8f5d27c6b67569cdc35842f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/433156
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
140 lines
4.9 KiB
C++
140 lines
4.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 "include/core/SkBitmap.h"
|
|
#include "include/core/SkColor.h"
|
|
#include "include/core/SkColorSpace.h"
|
|
#include "include/core/SkImageInfo.h"
|
|
#include "include/core/SkMatrix.h"
|
|
#include "include/core/SkPath.h"
|
|
#include "include/core/SkRect.h"
|
|
#include "include/core/SkRefCnt.h"
|
|
#include "include/core/SkStrokeRec.h"
|
|
#include "include/core/SkSurface.h"
|
|
#include "include/core/SkTypes.h"
|
|
#include "include/gpu/GrBackendSurface.h"
|
|
#include "include/gpu/GrContextOptions.h"
|
|
#include "include/gpu/GrDirectContext.h"
|
|
#include "include/gpu/GrTypes.h"
|
|
#include "include/private/GrTypesPriv.h"
|
|
#include "include/private/SkColorData.h"
|
|
#include "src/gpu/GrCaps.h"
|
|
#include "src/gpu/GrDirectContextPriv.h"
|
|
#include "src/gpu/GrFragmentProcessor.h"
|
|
#include "src/gpu/GrImageInfo.h"
|
|
#include "src/gpu/GrPaint.h"
|
|
#include "src/gpu/GrStyle.h"
|
|
#include "src/gpu/v1/SurfaceDrawContext_v1.h"
|
|
#include "tests/Test.h"
|
|
#include "tools/gpu/GrContextFactory.h"
|
|
|
|
#include <utility>
|
|
|
|
static void only_allow_default(GrContextOptions* options) {
|
|
options->fGpuPathRenderers = GpuPathRenderers::kNone;
|
|
}
|
|
|
|
static SkBitmap read_back(GrDirectContext* dContext,
|
|
skgpu::v1::SurfaceDrawContext* sdc,
|
|
int width, int height) {
|
|
|
|
SkImageInfo dstII = SkImageInfo::MakeN32Premul(width, height);
|
|
|
|
SkBitmap bm;
|
|
bm.allocPixels(dstII);
|
|
|
|
sdc->readPixels(dContext, bm.pixmap(), {0, 0});
|
|
|
|
return bm;
|
|
}
|
|
|
|
static SkPath make_path(const SkRect& outer, int inset, SkPathFillType fill) {
|
|
SkPath p;
|
|
|
|
p.addRect(outer, SkPathDirection::kCW);
|
|
p.addRect(outer.makeInset(inset, inset), SkPathDirection::kCCW);
|
|
p.setFillType(fill);
|
|
return p;
|
|
}
|
|
|
|
|
|
static const int kBigSize = 64; // This should be a power of 2
|
|
static const int kPad = 3;
|
|
|
|
// From crbug.com/769898:
|
|
// create an approx fit render target context that will have extra space (i.e., npot)
|
|
// draw an inverse wound concave path into it - forcing use of the stencil-using path renderer
|
|
// throw the RTC away so the backing GrSurface/GrStencilBuffer can be reused
|
|
// create a new render target context that will reuse the prior GrSurface
|
|
// draw a normally wound concave path that touches outside of the approx fit RTC's content rect
|
|
//
|
|
// When the bug manifests the GrDefaultPathRenderer/GrMSAAPathRenderer is/was leaving the stencil
|
|
// buffer outside of the first content rect in a bad state and the second draw would be incorrect.
|
|
|
|
static void run_test(GrDirectContext* dContext, skiatest::Reporter* reporter) {
|
|
SkPath invPath = make_path(SkRect::MakeXYWH(0, 0, kBigSize, kBigSize),
|
|
kBigSize/2-1, SkPathFillType::kInverseWinding);
|
|
SkPath path = make_path(SkRect::MakeXYWH(0, 0, kBigSize, kBigSize),
|
|
kPad, SkPathFillType::kWinding);
|
|
|
|
GrStyle style(SkStrokeRec::kFill_InitStyle);
|
|
|
|
{
|
|
auto sdc = skgpu::v1::SurfaceDrawContext::Make(dContext, GrColorType::kRGBA_8888, nullptr,
|
|
SkBackingFit::kApprox,
|
|
{kBigSize/2 + 1, kBigSize/2 + 1},
|
|
SkSurfaceProps());
|
|
|
|
sdc->clear(SK_PMColor4fBLACK);
|
|
|
|
GrPaint paint;
|
|
|
|
const SkPMColor4f color = { 1.0f, 0.0f, 0.0f, 1.0f };
|
|
auto fp = GrFragmentProcessor::MakeColor(color);
|
|
paint.setColorFragmentProcessor(std::move(fp));
|
|
|
|
sdc->drawPath(nullptr, std::move(paint), GrAA::kNo, SkMatrix::I(), invPath, style);
|
|
|
|
dContext->priv().flushSurface(sdc->asSurfaceProxy());
|
|
}
|
|
|
|
{
|
|
auto sdc = skgpu::v1::SurfaceDrawContext::Make(dContext, GrColorType::kRGBA_8888, nullptr,
|
|
SkBackingFit::kExact, {kBigSize, kBigSize},
|
|
SkSurfaceProps());
|
|
|
|
sdc->clear(SK_PMColor4fBLACK);
|
|
|
|
GrPaint paint;
|
|
|
|
const SkPMColor4f color = { 0.0f, 1.0f, 0.0f, 1.0f };
|
|
auto fp = GrFragmentProcessor::MakeColor(color);
|
|
paint.setColorFragmentProcessor(std::move(fp));
|
|
|
|
sdc->drawPath(nullptr, std::move(paint), GrAA::kNo,
|
|
SkMatrix::I(), path, style);
|
|
|
|
SkBitmap bm = read_back(dContext, sdc.get(), kBigSize, kBigSize);
|
|
|
|
bool correct = true;
|
|
for (int y = kBigSize/2+1; y < kBigSize-kPad-1 && correct; ++y) {
|
|
for (int x = kPad+1; x < kBigSize-kPad-1 && correct; ++x) {
|
|
correct = bm.getColor(x, y) == SK_ColorBLACK;
|
|
REPORTER_ASSERT(reporter, correct);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
DEF_GPUTEST_FOR_CONTEXTS(GrDefaultPathRendererTest,
|
|
sk_gpu_test::GrContextFactory::IsRenderingContext,
|
|
reporter, ctxInfo, only_allow_default) {
|
|
auto ctx = ctxInfo.directContext();
|
|
|
|
run_test(ctx, reporter);
|
|
}
|