31249bb2df
This reverts commit9e9188f84b. Reason for revert: Android-side fix has landed Original change's description: > Revert "Remove budgeted parameter from SkSurface::makeImageSnapshot" > > This reverts commitb64bcbdc3a. > > Reason for revert: > > Android build failed as shown below. > > frameworks/base/libs/hwui/VkLayer.cpp:32:41: error: too many arguments to function call, expected 0, have 1 > mImage = surface->makeImageSnapshot(SkBudgeted::kNo); > > Original change's description: > > Remove budgeted parameter from SkSurface::makeImageSnapshot > > > > This unused feature complicates MDB. > > > > Chrome compiles locally for me with this CL. > > > > Change-Id: I611e464885fb984030eace43ead42cf39d0e7f72 > > Reviewed-on: https://skia-review.googlesource.com/9734 > > Reviewed-by: Brian Salomon <bsalomon@google.com> > > Commit-Queue: Robert Phillips <robertphillips@google.com> > > > > TBR=bsalomon@google.com,robertphillips@google.com,reviews@skia.org > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > > Change-Id: Iae6e313c15b2352bd0d4fc7b5629de0a51ac398e > Reviewed-on: https://skia-review.googlesource.com/9788 > Reviewed-by: Yuqian Li <liyuqian@google.com> > Commit-Queue: Yuqian Li <liyuqian@google.com> > TBR=bsalomon@google.com,robertphillips@google.com,reviews@skia.org,liyuqian@google.com # Not skipping CQ checks because original CL landed > 1 day ago. Change-Id: If07d1b5db6e6c618d37445a0cf127780ed243a92 Reviewed-on: https://skia-review.googlesource.com/9843 Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Robert Phillips <robertphillips@google.com>
110 lines
3.9 KiB
C++
110 lines
3.9 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 "gm.h"
|
|
#include "SkPath.h"
|
|
#include "SkRandom.h"
|
|
#include "SkRRect.h"
|
|
#include "SkSurface.h"
|
|
|
|
namespace skiagm {
|
|
|
|
constexpr SkRect kSrcImageClip{75, 75, 275, 275};
|
|
|
|
/*
|
|
* The purpose of this test is to exercise all three codepaths in GrRenderTargetContext
|
|
* (drawFilledRect, fillRectToRect, fillRectWithLocalMatrix) that pre-crop filled rects based on the
|
|
* clip.
|
|
*
|
|
* The test creates an image of a green square surrounded by red background, then draws this image
|
|
* in various ways with the red clipped out. The test is successful if there is no visible red
|
|
* background, scissor is never used, and ideally, all the rectangles draw in one GrDrawOp.
|
|
*/
|
|
class CroppedRectsGM : public GM {
|
|
private:
|
|
SkString onShortName() override final { return SkString("croppedrects"); }
|
|
SkISize onISize() override { return SkISize::Make(500, 500); }
|
|
|
|
void onOnceBeforeDraw() override {
|
|
sk_sp<SkSurface> srcSurface = SkSurface::MakeRasterN32Premul(500, 500);
|
|
SkCanvas* srcCanvas = srcSurface->getCanvas();
|
|
|
|
srcCanvas->clear(SK_ColorRED);
|
|
|
|
SkPaint paint;
|
|
paint.setColor(0xff00ff00);
|
|
srcCanvas->drawRect(kSrcImageClip, paint);
|
|
|
|
constexpr SkScalar kStrokeWidth = 10;
|
|
SkPaint stroke;
|
|
stroke.setStyle(SkPaint::kStroke_Style);
|
|
stroke.setStrokeWidth(kStrokeWidth);
|
|
stroke.setColor(0xff008800);
|
|
srcCanvas->drawRect(kSrcImageClip.makeInset(kStrokeWidth / 2, kStrokeWidth / 2), stroke);
|
|
|
|
fSrcImage = srcSurface->makeImageSnapshot();
|
|
fSrcImageShader = fSrcImage->makeShader(SkShader::kClamp_TileMode,
|
|
SkShader::kClamp_TileMode);
|
|
}
|
|
|
|
void onDraw(SkCanvas* canvas) override {
|
|
canvas->clear(SK_ColorWHITE);
|
|
|
|
{
|
|
// GrRenderTargetContext::drawFilledRect.
|
|
SkAutoCanvasRestore acr(canvas, true);
|
|
SkPaint paint;
|
|
paint.setShader(fSrcImageShader);
|
|
paint.setFilterQuality(kNone_SkFilterQuality);
|
|
canvas->clipRect(kSrcImageClip);
|
|
canvas->drawPaint(paint);
|
|
}
|
|
|
|
{
|
|
// GrRenderTargetContext::fillRectToRect.
|
|
SkAutoCanvasRestore acr(canvas, true);
|
|
SkPaint paint;
|
|
paint.setFilterQuality(kNone_SkFilterQuality);
|
|
SkRect drawRect = SkRect::MakeXYWH(350, 100, 100, 300);
|
|
canvas->clipRect(drawRect);
|
|
canvas->drawImageRect(fSrcImage.get(),
|
|
kSrcImageClip.makeOutset(0.5f * kSrcImageClip.width(),
|
|
kSrcImageClip.height()),
|
|
drawRect.makeOutset(0.5f * drawRect.width(), drawRect.height()),
|
|
&paint);
|
|
}
|
|
|
|
{
|
|
// GrRenderTargetContext::fillRectWithLocalMatrix.
|
|
SkAutoCanvasRestore acr(canvas, true);
|
|
SkPath path;
|
|
path.moveTo(kSrcImageClip.fLeft - kSrcImageClip.width(), kSrcImageClip.centerY());
|
|
path.lineTo(kSrcImageClip.fRight + 3 * kSrcImageClip.width(), kSrcImageClip.centerY());
|
|
SkPaint paint;
|
|
paint.setStyle(SkPaint::kStroke_Style);
|
|
paint.setStrokeWidth(2 * kSrcImageClip.height());
|
|
paint.setShader(fSrcImageShader);
|
|
paint.setFilterQuality(kNone_SkFilterQuality);
|
|
canvas->translate(-90, 263);
|
|
canvas->scale(300 / kSrcImageClip.width(), 100 / kSrcImageClip.height());
|
|
canvas->clipRect(kSrcImageClip);
|
|
canvas->drawPath(path, paint);
|
|
}
|
|
|
|
// TODO: assert the draw target only has one op in the post-MDB world.
|
|
}
|
|
|
|
sk_sp<SkImage> fSrcImage;
|
|
sk_sp<SkShader> fSrcImageShader;
|
|
|
|
typedef GM INHERITED;
|
|
};
|
|
|
|
DEF_GM( return new CroppedRectsGM(); )
|
|
|
|
}
|