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>
305 lines
12 KiB
C++
305 lines
12 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/core/SkColor.h"
|
|
#include "include/core/SkColorSpace.h"
|
|
#include "include/core/SkImageInfo.h"
|
|
#include "include/core/SkPaint.h"
|
|
#include "include/core/SkRect.h"
|
|
#include "include/core/SkRefCnt.h"
|
|
#include "include/core/SkSurface.h"
|
|
#include "include/core/SkTypes.h"
|
|
#include "include/gpu/GrContext.h"
|
|
#include "include/gpu/GrContextOptions.h"
|
|
#include "include/private/GrTypesPriv.h"
|
|
#include "include/private/SkColorData.h"
|
|
#include "src/core/SkAutoPixmapStorage.h"
|
|
#include "src/gpu/GrColor.h"
|
|
#include "src/gpu/GrContextPriv.h"
|
|
#include "src/gpu/GrImageInfo.h"
|
|
#include "src/gpu/GrRenderTargetContext.h"
|
|
#include "tests/Test.h"
|
|
#include "tools/gpu/GrContextFactory.h"
|
|
|
|
#include <cstdint>
|
|
#include <memory>
|
|
|
|
static bool check_rect(GrRenderTargetContext* rtc, const SkIRect& rect, uint32_t expectedValue,
|
|
uint32_t* actualValue, int* failX, int* failY) {
|
|
int w = rect.width();
|
|
int h = rect.height();
|
|
|
|
SkImageInfo dstInfo = SkImageInfo::Make(w, h, kRGBA_8888_SkColorType, kPremul_SkAlphaType);
|
|
|
|
SkAutoPixmapStorage readback;
|
|
readback.alloc(dstInfo);
|
|
|
|
readback.erase(~expectedValue);
|
|
if (!rtc->readPixels(readback.info(), readback.writable_addr(), readback.rowBytes(),
|
|
{rect.fLeft, rect.fTop})) {
|
|
return false;
|
|
}
|
|
|
|
for (int y = 0; y < h; ++y) {
|
|
for (int x = 0; x < w; ++x) {
|
|
uint32_t pixel = readback.addr32()[y * w + x];
|
|
if (pixel != expectedValue) {
|
|
*actualValue = pixel;
|
|
*failX = x + rect.fLeft;
|
|
*failY = y + rect.fTop;
|
|
return false;
|
|
}
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
|
|
std::unique_ptr<GrRenderTargetContext> newRTC(GrContext* context, int w, int h) {
|
|
return GrRenderTargetContext::Make(
|
|
context, GrColorType::kRGBA_8888, nullptr, SkBackingFit::kExact, {w, h});
|
|
}
|
|
|
|
static void clear_op_test(skiatest::Reporter* reporter, GrContext* context) {
|
|
static const int kW = 10;
|
|
static const int kH = 10;
|
|
|
|
SkIRect fullRect = SkIRect::MakeWH(kW, kH);
|
|
std::unique_ptr<GrRenderTargetContext> rtContext;
|
|
|
|
// A rectangle that is inset by one on all sides and the 1-pixel wide rectangles that surround
|
|
// it.
|
|
SkIRect mid1Rect = SkIRect::MakeXYWH(1, 1, kW-2, kH-2);
|
|
SkIRect outerLeftEdge = SkIRect::MakeXYWH(0, 0, 1, kH);
|
|
SkIRect outerTopEdge = SkIRect::MakeXYWH(0, 0, kW, 1);
|
|
SkIRect outerRightEdge = SkIRect::MakeXYWH(kW-1, 0, 1, kH);
|
|
SkIRect outerBottomEdge = SkIRect::MakeXYWH(0, kH-1, kW, 1);
|
|
|
|
// A rectangle that is inset by two on all sides and the 1-pixel wide rectangles that surround
|
|
// it.
|
|
SkIRect mid2Rect = SkIRect::MakeXYWH(2, 2, kW-4, kH-4);
|
|
SkIRect innerLeftEdge = SkIRect::MakeXYWH(1, 1, 1, kH-2);
|
|
SkIRect innerTopEdge = SkIRect::MakeXYWH(1, 1, kW-2, 1);
|
|
SkIRect innerRightEdge = SkIRect::MakeXYWH(kW-2, 1, 1, kH-2);
|
|
SkIRect innerBottomEdge = SkIRect::MakeXYWH(1, kH-2, kW-2, 1);
|
|
|
|
uint32_t actualValue;
|
|
int failX, failY;
|
|
|
|
static const GrColor kColor1 = 0xABCDEF01;
|
|
static const GrColor kColor2 = ~kColor1;
|
|
static const SkPMColor4f kColor1f = SkPMColor4f::FromBytes_RGBA(kColor1);
|
|
static const SkPMColor4f kColor2f = SkPMColor4f::FromBytes_RGBA(kColor2);
|
|
|
|
rtContext = newRTC(context, kW, kH);
|
|
SkASSERT(rtContext);
|
|
|
|
// Check a full clear
|
|
rtContext->clear(fullRect, kColor1f);
|
|
if (!check_rect(rtContext.get(), fullRect, kColor1, &actualValue, &failX, &failY)) {
|
|
ERRORF(reporter, "Expected 0x%08x but got 0x%08x at (%d, %d).", kColor1, actualValue,
|
|
failX, failY);
|
|
}
|
|
|
|
rtContext = newRTC(context, kW, kH);
|
|
SkASSERT(rtContext);
|
|
|
|
// Check two full clears, same color
|
|
rtContext->clear(fullRect, kColor1f);
|
|
rtContext->clear(fullRect, kColor1f);
|
|
if (!check_rect(rtContext.get(), fullRect, kColor1, &actualValue, &failX, &failY)) {
|
|
ERRORF(reporter, "Expected 0x%08x but got 0x%08x at (%d, %d).", kColor1, actualValue,
|
|
failX, failY);
|
|
}
|
|
|
|
rtContext = newRTC(context, kW, kH);
|
|
SkASSERT(rtContext);
|
|
|
|
// Check two full clears, different colors
|
|
rtContext->clear(fullRect, kColor1f);
|
|
rtContext->clear(fullRect, kColor2f);
|
|
if (!check_rect(rtContext.get(), fullRect, kColor2, &actualValue, &failX, &failY)) {
|
|
ERRORF(reporter, "Expected 0x%08x but got 0x%08x at (%d, %d).", kColor2, actualValue,
|
|
failX, failY);
|
|
}
|
|
|
|
rtContext = newRTC(context, kW, kH);
|
|
SkASSERT(rtContext);
|
|
|
|
// Test a full clear followed by a same color inset clear
|
|
rtContext->clear(fullRect, kColor1f);
|
|
rtContext->clear(mid1Rect, kColor1f);
|
|
if (!check_rect(rtContext.get(), fullRect, kColor1, &actualValue, &failX, &failY)) {
|
|
ERRORF(reporter, "Expected 0x%08x but got 0x%08x at (%d, %d).", kColor1, actualValue,
|
|
failX, failY);
|
|
}
|
|
|
|
rtContext = newRTC(context, kW, kH);
|
|
SkASSERT(rtContext);
|
|
|
|
// Test a inset clear followed by same color full clear
|
|
rtContext->clear(mid1Rect, kColor1f);
|
|
rtContext->clear(fullRect, kColor1f);
|
|
if (!check_rect(rtContext.get(), fullRect, kColor1, &actualValue, &failX, &failY)) {
|
|
ERRORF(reporter, "Expected 0x%08x but got 0x%08x at (%d, %d).", kColor1, actualValue,
|
|
failX, failY);
|
|
}
|
|
|
|
rtContext = newRTC(context, kW, kH);
|
|
SkASSERT(rtContext);
|
|
|
|
// Test a full clear followed by a different color inset clear
|
|
rtContext->clear(fullRect, kColor1f);
|
|
rtContext->clear(mid1Rect, kColor2f);
|
|
if (!check_rect(rtContext.get(), mid1Rect, kColor2, &actualValue, &failX, &failY)) {
|
|
ERRORF(reporter, "Expected 0x%08x but got 0x%08x at (%d, %d).", kColor2, actualValue,
|
|
failX, failY);
|
|
}
|
|
if (!check_rect(rtContext.get(), outerLeftEdge, kColor1, &actualValue, &failX, &failY) ||
|
|
!check_rect(rtContext.get(), outerTopEdge, kColor1, &actualValue, &failX, &failY) ||
|
|
!check_rect(rtContext.get(), outerRightEdge, kColor1, &actualValue, &failX, &failY) ||
|
|
!check_rect(rtContext.get(), outerBottomEdge, kColor1, &actualValue, &failX, &failY)) {
|
|
ERRORF(reporter, "Expected 0x%08x but got 0x%08x at (%d, %d).", kColor1, actualValue,
|
|
failX, failY);
|
|
}
|
|
|
|
rtContext = newRTC(context, kW, kH);
|
|
SkASSERT(rtContext);
|
|
|
|
// Test a inset clear followed by a different full clear
|
|
rtContext->clear(mid1Rect, kColor2f);
|
|
rtContext->clear(fullRect, kColor1f);
|
|
if (!check_rect(rtContext.get(), fullRect, kColor1, &actualValue, &failX, &failY)) {
|
|
ERRORF(reporter, "Expected 0x%08x but got 0x%08x at (%d, %d).", kColor1, actualValue,
|
|
failX, failY);
|
|
}
|
|
|
|
rtContext = newRTC(context, kW, kH);
|
|
SkASSERT(rtContext);
|
|
|
|
// Check three nested clears from largest to smallest where outermost and innermost are same
|
|
// color.
|
|
rtContext->clear(fullRect, kColor1f);
|
|
rtContext->clear(mid1Rect, kColor2f);
|
|
rtContext->clear(mid2Rect, kColor1f);
|
|
if (!check_rect(rtContext.get(), mid2Rect, kColor1, &actualValue, &failX, &failY)) {
|
|
ERRORF(reporter, "Expected 0x%08x but got 0x%08x at (%d, %d).", kColor1, actualValue,
|
|
failX, failY);
|
|
}
|
|
if (!check_rect(rtContext.get(), innerLeftEdge, kColor2, &actualValue, &failX, &failY) ||
|
|
!check_rect(rtContext.get(), innerTopEdge, kColor2, &actualValue, &failX, &failY) ||
|
|
!check_rect(rtContext.get(), innerRightEdge, kColor2, &actualValue, &failX, &failY) ||
|
|
!check_rect(rtContext.get(), innerBottomEdge, kColor2, &actualValue, &failX, &failY)) {
|
|
ERRORF(reporter, "Expected 0x%08x but got 0x%08x at (%d, %d).", kColor2, actualValue,
|
|
failX, failY);
|
|
}
|
|
if (!check_rect(rtContext.get(), outerLeftEdge, kColor1, &actualValue, &failX, &failY) ||
|
|
!check_rect(rtContext.get(), outerTopEdge, kColor1, &actualValue, &failX, &failY) ||
|
|
!check_rect(rtContext.get(), outerRightEdge, kColor1, &actualValue, &failX, &failY) ||
|
|
!check_rect(rtContext.get(), outerBottomEdge, kColor1, &actualValue, &failX, &failY)) {
|
|
ERRORF(reporter, "Expected 0x%08x but got 0x%08x at (%d, %d).", kColor1, actualValue,
|
|
failX, failY);
|
|
}
|
|
|
|
rtContext = newRTC(context, kW, kH);
|
|
SkASSERT(rtContext);
|
|
|
|
// Swap the order of the second two clears in the above test.
|
|
rtContext->clear(fullRect, kColor1f);
|
|
rtContext->clear(mid2Rect, kColor1f);
|
|
rtContext->clear(mid1Rect, kColor2f);
|
|
if (!check_rect(rtContext.get(), mid1Rect, kColor2, &actualValue, &failX, &failY)) {
|
|
ERRORF(reporter, "Expected 0x%08x but got 0x%08x at (%d, %d).", kColor2, actualValue,
|
|
failX, failY);
|
|
}
|
|
if (!check_rect(rtContext.get(), outerLeftEdge, kColor1, &actualValue, &failX, &failY) ||
|
|
!check_rect(rtContext.get(), outerTopEdge, kColor1, &actualValue, &failX, &failY) ||
|
|
!check_rect(rtContext.get(), outerRightEdge, kColor1, &actualValue, &failX, &failY) ||
|
|
!check_rect(rtContext.get(), outerBottomEdge, kColor1, &actualValue, &failX, &failY)) {
|
|
ERRORF(reporter, "Expected 0x%08x but got 0x%08x at (%d, %d).", kColor1, actualValue,
|
|
failX, failY);
|
|
}
|
|
}
|
|
|
|
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ClearOp, reporter, ctxInfo) {
|
|
// Regular clear
|
|
clear_op_test(reporter, ctxInfo.grContext());
|
|
|
|
// Force drawing for clears
|
|
GrContextOptions options(ctxInfo.options());
|
|
options.fUseDrawInsteadOfClear = GrContextOptions::Enable::kYes;
|
|
sk_gpu_test::GrContextFactory workaroundFactory(options);
|
|
clear_op_test(reporter, workaroundFactory.get(ctxInfo.type()));
|
|
}
|
|
|
|
void fullscreen_clear_with_layer_test(skiatest::Reporter* reporter, GrContext* context) {
|
|
const SkImageInfo ii = SkImageInfo::Make(400, 77, kRGBA_8888_SkColorType, kPremul_SkAlphaType);
|
|
|
|
sk_sp<SkSurface> surf = SkSurface::MakeRenderTarget(context, SkBudgeted::kYes, ii);
|
|
SkCanvas* canvas = surf->getCanvas();
|
|
|
|
SkPaint paints[2];
|
|
paints[0].setColor(SK_ColorGREEN);
|
|
paints[1].setColor(SK_ColorGRAY);
|
|
|
|
static const int kLeftX = 158;
|
|
static const int kMidX = 258;
|
|
static const int kRightX = 383;
|
|
static const int kTopY = 26;
|
|
static const int kBotY = 51;
|
|
|
|
const SkRect rects[2] = {
|
|
{ kLeftX, kTopY, kMidX, kBotY },
|
|
{ kMidX, kTopY, kRightX, kBotY },
|
|
};
|
|
|
|
for (int i = 0; i < 2; ++i) {
|
|
// the bounds parameter is required to cause a full screen clear
|
|
canvas->saveLayer(&rects[i], nullptr);
|
|
canvas->drawRect(rects[i], paints[i]);
|
|
canvas->restore();
|
|
}
|
|
|
|
SkBitmap bm;
|
|
bm.allocPixels(ii, 0);
|
|
|
|
SkAssertResult(surf->readPixels(bm, 0, 0));
|
|
|
|
bool isCorrect = true;
|
|
for (int y = kTopY; isCorrect && y < kBotY; ++y) {
|
|
const uint32_t* sl = bm.getAddr32(0, y);
|
|
|
|
for (int x = kLeftX; x < kMidX; ++x) {
|
|
if (SK_ColorGREEN != sl[x]) {
|
|
isCorrect = false;
|
|
break;
|
|
}
|
|
}
|
|
|
|
for (int x = kMidX; x < kRightX; ++x) {
|
|
if (SK_ColorGRAY != sl[x]) {
|
|
isCorrect = false;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
REPORTER_ASSERT(reporter, isCorrect);
|
|
}
|
|
// From crbug.com/768134
|
|
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(FullScreenClearWithLayers, reporter, ctxInfo) {
|
|
// Regular clear
|
|
fullscreen_clear_with_layer_test(reporter, ctxInfo.grContext());
|
|
|
|
// Use draws for clears
|
|
GrContextOptions options(ctxInfo.options());
|
|
options.fUseDrawInsteadOfClear = GrContextOptions::Enable::kYes;
|
|
sk_gpu_test::GrContextFactory workaroundFactory(options);
|
|
fullscreen_clear_with_layer_test(reporter, workaroundFactory.get(ctxInfo.type()));
|
|
}
|