81d4172d86
This reverts commit4730f29993
. Reason for revert: Fix WIP Original change's description: > Revert "Simplify GrRTC::clean APIs" > > This reverts commit6cbd7c2e57
. > > Reason for revert: mac/generated files failures > > Original change's description: > > Simplify GrRTC::clean APIs > > > > The CanClearFullscreen enum type is removed. Most usages of clear() had > > kYes because a null scissor rect was provided, or had kNo because the > > scissor was really critical to the behavior. A few places did provide a > > scissor and kYes (e.g. for initializing the target). > > > > To simplify this, the public GrRTC has two variants of clear(). One with > > only a color (for fullscreen clears), and one with a rect for partial > > clears. The private API also adds a clearAtLeast() function that replaces > > the several cases where we'd have a scissor but could expand to fullscreen. > > > > I find the current control flow in internalClear() to be hard to > > follow (albeit I was the one to make it that way...), but later CLs > > will improve it. > > > > Bug: skia:10205 > > Change-Id: I87cf8d688c58fbe58ee854fbc4ffe22482d969c6 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/290256 > > Reviewed-by: Brian Salomon <bsalomon@google.com> > > Commit-Queue: Michael Ludwig <michaelludwig@google.com> > > TBR=bsalomon@google.com,csmartdalton@google.com,michaelludwig@google.com > > Change-Id: I7131df6f5323f4f9c120cbcfd9bc57e627e2eb65 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia:10205 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/291842 > Reviewed-by: Michael Ludwig <michaelludwig@google.com> > Commit-Queue: Michael Ludwig <michaelludwig@google.com> # Not skipping CQ checks because this is a reland. Bug: skia:10205 Change-Id: Id5db153d7c2500279cca8478818b66f67a53e143 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/291844 Reviewed-by: Michael Ludwig <michaelludwig@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Michael Ludwig <michaelludwig@google.com>
140 lines
4.7 KiB
C++
140 lines
4.7 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/GrContext.h"
|
|
#include "include/gpu/GrContextOptions.h"
|
|
#include "include/gpu/GrTypes.h"
|
|
#include "include/private/GrTypesPriv.h"
|
|
#include "include/private/SkColorData.h"
|
|
#include "src/gpu/GrCaps.h"
|
|
#include "src/gpu/GrClip.h"
|
|
#include "src/gpu/GrContextPriv.h"
|
|
#include "src/gpu/GrFragmentProcessor.h"
|
|
#include "src/gpu/GrImageInfo.h"
|
|
#include "src/gpu/GrPaint.h"
|
|
#include "src/gpu/GrRenderTargetContext.h"
|
|
#include "src/gpu/GrStyle.h"
|
|
#include "src/gpu/effects/generated/GrConstColorProcessor.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(GrRenderTargetContext* rtc, int width, int height) {
|
|
|
|
SkImageInfo dstII = SkImageInfo::MakeN32Premul(width, height);
|
|
|
|
SkBitmap bm;
|
|
bm.allocPixels(dstII);
|
|
|
|
rtc->readPixels(dstII, bm.getAddr(0, 0), bm.rowBytes(), {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(GrContext* ctx, 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 rtc = GrRenderTargetContext::Make(
|
|
ctx, GrColorType::kRGBA_8888, nullptr, SkBackingFit::kApprox,
|
|
{kBigSize/2 + 1, kBigSize/2 + 1});
|
|
|
|
rtc->clear(SK_PMColor4fBLACK);
|
|
|
|
GrPaint paint;
|
|
|
|
const SkPMColor4f color = { 1.0f, 0.0f, 0.0f, 1.0f };
|
|
auto fp = GrConstColorProcessor::Make(color, GrConstColorProcessor::InputMode::kIgnore);
|
|
paint.addColorFragmentProcessor(std::move(fp));
|
|
|
|
rtc->drawPath(GrNoClip(), std::move(paint), GrAA::kNo,
|
|
SkMatrix::I(), invPath, style);
|
|
|
|
rtc->flush(SkSurface::BackendSurfaceAccess::kNoAccess, GrFlushInfo());
|
|
}
|
|
|
|
{
|
|
auto rtc = GrRenderTargetContext::Make(
|
|
ctx, GrColorType::kRGBA_8888, nullptr, SkBackingFit::kExact, {kBigSize, kBigSize});
|
|
|
|
rtc->clear(SK_PMColor4fBLACK);
|
|
|
|
GrPaint paint;
|
|
|
|
const SkPMColor4f color = { 0.0f, 1.0f, 0.0f, 1.0f };
|
|
auto fp = GrConstColorProcessor::Make(color, GrConstColorProcessor::InputMode::kIgnore);
|
|
paint.addColorFragmentProcessor(std::move(fp));
|
|
|
|
rtc->drawPath(GrNoClip(), std::move(paint), GrAA::kNo,
|
|
SkMatrix::I(), path, style);
|
|
|
|
SkBitmap bm = read_back(rtc.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) {
|
|
GrContext* ctx = ctxInfo.grContext();
|
|
|
|
run_test(ctx, reporter);
|
|
}
|