46cfbc67f6
This reverts commit4c6f9b7670
. Reason for revert: Landing with neuxs 7 and androind one fixes Original change's description: > Revert "Reland "Remove support for copyAsDraw in gpu copySurface."" > > This reverts commit84ea04949c
. > > Reason for revert: nexus 7 and android one broken > > Original change's description: > > Reland "Remove support for copyAsDraw in gpu copySurface." > > > > This reverts commitc5167c053b
. > > > > Reason for revert: fixed > > > > Original change's description: > > > Revert "Remove support for copyAsDraw in gpu copySurface." > > > > > > This reverts commit6565506463
. > > > > > > Reason for revert: seems to break things? > > > > > > Original change's description: > > > > Remove support for copyAsDraw in gpu copySurface. > > > > > > > > The major changes on a higher lever are: > > > > 1) The majority of all copies now go through GrSurfaceProxy::Copy which > > > > takes in a proxy and returns a new one with the data copied to it. This > > > > is the most common use case within Ganesh. > > > > > > > > 2) The backend copy calls no longer do draws, require origins to be the > > > > same, and won't do any swizzling or adjustment of subrects. They are > > > > all implemented to be dumb copy this data to this other spot. > > > > > > > > 3) The GrSurfaceContext copy call has now been moved to priv and renamed > > > > copyNoDraw, and a new priv copyAsDraw was added to GrRenderTargetContext. > > > > > > > > 4) WritePixels and ReplaceRenderTarget both need to specifiy the destination > > > > of copies. They are the only users (besides the GrSurfaceProxy::Copy) which > > > > call the priv methods on GrSurfaceContext. > > > > > > > > Change-Id: Iaf1eb3a73ccaf39a75af77e281dae594f809186f > > > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/217459 > > > > Reviewed-by: Brian Salomon <bsalomon@google.com> > > > > Commit-Queue: Greg Daniel <egdaniel@google.com> > > > > > > TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com > > > > > > Change-Id: Id43aa8aa1451e794342e930441d9975b90e6b59f > > > No-Presubmit: true > > > No-Tree-Checks: true > > > No-Try: true > > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/218549 > > > Reviewed-by: Greg Daniel <egdaniel@google.com> > > > Commit-Queue: Greg Daniel <egdaniel@google.com> > > > > TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com > > > > Change-Id: I1a96f85ae2ff7622a6b57406755d478e7fbcf56e > > No-Presubmit: true > > No-Tree-Checks: true > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/218797 > > Reviewed-by: Brian Salomon <bsalomon@google.com> > > Commit-Queue: Greg Daniel <egdaniel@google.com> > > TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com > > Change-Id: I310930a9df30535f45a065263a40239141e15562 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/219384 > Reviewed-by: Greg Daniel <egdaniel@google.com> > Commit-Queue: Greg Daniel <egdaniel@google.com> TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com Change-Id: I88df4f19aa26ed77b5af4e25d138387cbabd1934 No-Presubmit: true No-Tree-Checks: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/219386 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com>
332 lines
11 KiB
C++
332 lines
11 KiB
C++
/*
|
|
* Copyright 2015 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "gm/gm.h"
|
|
#include "include/core/SkBitmap.h"
|
|
#include "include/core/SkCanvas.h"
|
|
#include "include/core/SkColor.h"
|
|
#include "include/core/SkColorSpace.h"
|
|
#include "include/core/SkImage.h"
|
|
#include "include/core/SkImageGenerator.h"
|
|
#include "include/core/SkImageInfo.h"
|
|
#include "include/core/SkMatrix.h"
|
|
#include "include/core/SkPaint.h"
|
|
#include "include/core/SkPicture.h"
|
|
#include "include/core/SkPictureRecorder.h"
|
|
#include "include/core/SkPoint.h"
|
|
#include "include/core/SkRect.h"
|
|
#include "include/core/SkRefCnt.h"
|
|
#include "include/core/SkScalar.h"
|
|
#include "include/core/SkSize.h"
|
|
#include "include/core/SkString.h"
|
|
#include "include/core/SkSurface.h"
|
|
#include "include/core/SkTypes.h"
|
|
#include "include/gpu/GrContext.h"
|
|
#include "include/gpu/GrSamplerState.h"
|
|
#include "include/gpu/GrTypes.h"
|
|
#include "include/private/GrTextureProxy.h"
|
|
#include "include/private/GrTypesPriv.h"
|
|
#include "src/core/SkMakeUnique.h"
|
|
#include "src/gpu/GrContextPriv.h"
|
|
#include "src/gpu/GrSurfaceContext.h"
|
|
#include "src/image/SkImage_Base.h"
|
|
#include "src/image/SkImage_Gpu.h"
|
|
|
|
#include <memory>
|
|
#include <utility>
|
|
|
|
class GrRecordingContext;
|
|
|
|
static void draw_something(SkCanvas* canvas, const SkRect& bounds) {
|
|
SkPaint paint;
|
|
paint.setAntiAlias(true);
|
|
paint.setColor(SK_ColorRED);
|
|
paint.setStyle(SkPaint::kStroke_Style);
|
|
paint.setStrokeWidth(10);
|
|
canvas->drawRect(bounds, paint);
|
|
paint.setStyle(SkPaint::kFill_Style);
|
|
paint.setColor(SK_ColorBLUE);
|
|
canvas->drawOval(bounds, paint);
|
|
}
|
|
|
|
/*
|
|
* Exercise drawing pictures inside an image, showing that the image version is pixelated
|
|
* (correctly) when it is inside an image.
|
|
*/
|
|
class ImagePictGM : public skiagm::GM {
|
|
sk_sp<SkPicture> fPicture;
|
|
sk_sp<SkImage> fImage0;
|
|
sk_sp<SkImage> fImage1;
|
|
public:
|
|
ImagePictGM() {}
|
|
|
|
protected:
|
|
SkString onShortName() override {
|
|
return SkString("image-picture");
|
|
}
|
|
|
|
SkISize onISize() override {
|
|
return SkISize::Make(850, 450);
|
|
}
|
|
|
|
void onOnceBeforeDraw() override {
|
|
const SkRect bounds = SkRect::MakeXYWH(100, 100, 100, 100);
|
|
SkPictureRecorder recorder;
|
|
draw_something(recorder.beginRecording(bounds), bounds);
|
|
fPicture = recorder.finishRecordingAsPicture();
|
|
|
|
// extract enough just for the oval.
|
|
const SkISize size = SkISize::Make(100, 100);
|
|
auto srgbColorSpace = SkColorSpace::MakeSRGB();
|
|
|
|
SkMatrix matrix;
|
|
matrix.setTranslate(-100, -100);
|
|
fImage0 = SkImage::MakeFromPicture(fPicture, size, &matrix, nullptr,
|
|
SkImage::BitDepth::kU8, srgbColorSpace);
|
|
matrix.postTranslate(-50, -50);
|
|
matrix.postRotate(45);
|
|
matrix.postTranslate(50, 50);
|
|
fImage1 = SkImage::MakeFromPicture(fPicture, size, &matrix, nullptr,
|
|
SkImage::BitDepth::kU8, srgbColorSpace);
|
|
}
|
|
|
|
void drawSet(SkCanvas* canvas) const {
|
|
SkMatrix matrix = SkMatrix::MakeTrans(-100, -100);
|
|
canvas->drawPicture(fPicture, &matrix, nullptr);
|
|
canvas->drawImage(fImage0.get(), 150, 0);
|
|
canvas->drawImage(fImage1.get(), 300, 0);
|
|
}
|
|
|
|
void onDraw(SkCanvas* canvas) override {
|
|
canvas->translate(20, 20);
|
|
|
|
this->drawSet(canvas);
|
|
|
|
canvas->save();
|
|
canvas->translate(0, 130);
|
|
canvas->scale(0.25f, 0.25f);
|
|
this->drawSet(canvas);
|
|
canvas->restore();
|
|
|
|
canvas->save();
|
|
canvas->translate(0, 200);
|
|
canvas->scale(2, 2);
|
|
this->drawSet(canvas);
|
|
canvas->restore();
|
|
}
|
|
|
|
private:
|
|
typedef skiagm::GM INHERITED;
|
|
};
|
|
DEF_GM( return new ImagePictGM; )
|
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
static std::unique_ptr<SkImageGenerator> make_pic_generator(GrContext*, sk_sp<SkPicture> pic) {
|
|
SkMatrix matrix;
|
|
matrix.setTranslate(-100, -100);
|
|
return SkImageGenerator::MakeFromPicture({ 100, 100 }, std::move(pic), &matrix, nullptr,
|
|
SkImage::BitDepth::kU8,
|
|
SkColorSpace::MakeSRGB());
|
|
}
|
|
|
|
class RasterGenerator : public SkImageGenerator {
|
|
public:
|
|
RasterGenerator(const SkBitmap& bm) : SkImageGenerator(bm.info()), fBM(bm)
|
|
{}
|
|
|
|
protected:
|
|
bool onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes,
|
|
const Options&) override {
|
|
SkASSERT(fBM.width() == info.width());
|
|
SkASSERT(fBM.height() == info.height());
|
|
return fBM.readPixels(info, pixels, rowBytes, 0, 0);
|
|
}
|
|
private:
|
|
SkBitmap fBM;
|
|
};
|
|
static std::unique_ptr<SkImageGenerator> make_ras_generator(GrContext*, sk_sp<SkPicture> pic) {
|
|
SkBitmap bm;
|
|
bm.allocN32Pixels(100, 100);
|
|
SkCanvas canvas(bm);
|
|
canvas.clear(0);
|
|
canvas.translate(-100, -100);
|
|
canvas.drawPicture(pic);
|
|
return skstd::make_unique<RasterGenerator>(bm);
|
|
}
|
|
|
|
class EmptyGenerator : public SkImageGenerator {
|
|
public:
|
|
EmptyGenerator(const SkImageInfo& info) : SkImageGenerator(info) {}
|
|
};
|
|
|
|
class TextureGenerator : public SkImageGenerator {
|
|
public:
|
|
TextureGenerator(GrContext* ctx, const SkImageInfo& info, sk_sp<SkPicture> pic)
|
|
: SkImageGenerator(info)
|
|
, fCtx(SkRef(ctx)) {
|
|
|
|
sk_sp<SkSurface> surface(SkSurface::MakeRenderTarget(ctx, SkBudgeted::kYes, info, 0,
|
|
kTopLeft_GrSurfaceOrigin, nullptr));
|
|
if (surface) {
|
|
surface->getCanvas()->clear(0);
|
|
surface->getCanvas()->translate(-100, -100);
|
|
surface->getCanvas()->drawPicture(pic);
|
|
sk_sp<SkImage> image(surface->makeImageSnapshot());
|
|
fProxy = as_IB(image)->asTextureProxyRef(fCtx.get());
|
|
}
|
|
}
|
|
protected:
|
|
sk_sp<GrTextureProxy> onGenerateTexture(GrRecordingContext* ctx, const SkImageInfo& info,
|
|
const SkIPoint& origin,
|
|
bool willBeMipped) override {
|
|
SkASSERT(ctx);
|
|
SkASSERT(ctx == fCtx.get());
|
|
|
|
if (!fProxy) {
|
|
return nullptr;
|
|
}
|
|
|
|
if (origin.fX == 0 && origin.fY == 0 &&
|
|
info.width() == fProxy->width() && info.height() == fProxy->height()) {
|
|
return fProxy;
|
|
}
|
|
|
|
GrMipMapped mipMapped = willBeMipped ? GrMipMapped::kYes : GrMipMapped::kNo;
|
|
|
|
return GrSurfaceProxy::Copy(fCtx.get(), fProxy.get(), mipMapped,
|
|
SkIRect::MakeXYWH(origin.x(), origin.y(), info.width(), info.height()),
|
|
SkBackingFit::kExact, SkBudgeted::kYes);
|
|
}
|
|
|
|
private:
|
|
sk_sp<GrContext> fCtx;
|
|
sk_sp<GrTextureProxy> fProxy;
|
|
};
|
|
|
|
static std::unique_ptr<SkImageGenerator> make_tex_generator(GrContext* ctx, sk_sp<SkPicture> pic) {
|
|
const SkImageInfo info = SkImageInfo::MakeN32Premul(100, 100);
|
|
|
|
if (!ctx) {
|
|
return skstd::make_unique<EmptyGenerator>(info);
|
|
}
|
|
return skstd::make_unique<TextureGenerator>(ctx, info, pic);
|
|
}
|
|
|
|
class ImageCacheratorGM : public skiagm::GM {
|
|
SkString fName;
|
|
std::unique_ptr<SkImageGenerator> (*fFactory)(GrContext*, sk_sp<SkPicture>);
|
|
sk_sp<SkPicture> fPicture;
|
|
sk_sp<SkImage> fImage;
|
|
sk_sp<SkImage> fImageSubset;
|
|
|
|
public:
|
|
ImageCacheratorGM(const char suffix[],
|
|
std::unique_ptr<SkImageGenerator> (*factory)(GrContext*, sk_sp<SkPicture>))
|
|
: fFactory(factory)
|
|
{
|
|
fName.printf("image-cacherator-from-%s", suffix);
|
|
}
|
|
|
|
protected:
|
|
SkString onShortName() override {
|
|
return fName;
|
|
}
|
|
|
|
SkISize onISize() override {
|
|
return SkISize::Make(960, 450);
|
|
}
|
|
|
|
void onOnceBeforeDraw() override {
|
|
const SkRect bounds = SkRect::MakeXYWH(100, 100, 100, 100);
|
|
SkPictureRecorder recorder;
|
|
draw_something(recorder.beginRecording(bounds), bounds);
|
|
fPicture = recorder.finishRecordingAsPicture();
|
|
}
|
|
|
|
void makeCaches(GrContext* ctx) {
|
|
auto gen = fFactory(ctx, fPicture);
|
|
fImage = SkImage::MakeFromGenerator(std::move(gen));
|
|
|
|
const SkIRect subset = SkIRect::MakeLTRB(50, 50, 100, 100);
|
|
|
|
gen = fFactory(ctx, fPicture);
|
|
fImageSubset = SkImage::MakeFromGenerator(std::move(gen), &subset);
|
|
|
|
SkASSERT(fImage->dimensions() == SkISize::Make(100, 100));
|
|
SkASSERT(fImageSubset->dimensions() == SkISize::Make(50, 50));
|
|
}
|
|
|
|
static void draw_as_bitmap(SkCanvas* canvas, SkImage* image, SkScalar x, SkScalar y) {
|
|
SkBitmap bitmap;
|
|
as_IB(image)->getROPixels(&bitmap);
|
|
canvas->drawBitmap(bitmap, x, y);
|
|
}
|
|
|
|
static void draw_as_tex(SkCanvas* canvas, SkImage* image, SkScalar x, SkScalar y) {
|
|
sk_sp<GrTextureProxy> proxy(as_IB(image)->asTextureProxyRef(
|
|
canvas->getGrContext(), GrSamplerState::ClampBilerp(), nullptr));
|
|
if (!proxy) {
|
|
// show placeholder if we have no texture
|
|
SkPaint paint;
|
|
paint.setStyle(SkPaint::kStroke_Style);
|
|
SkRect r = SkRect::MakeXYWH(x, y, SkIntToScalar(image->width()),
|
|
SkIntToScalar(image->width()));
|
|
canvas->drawRect(r, paint);
|
|
canvas->drawLine(r.left(), r.top(), r.right(), r.bottom(), paint);
|
|
canvas->drawLine(r.left(), r.bottom(), r.right(), r.top(), paint);
|
|
return;
|
|
}
|
|
|
|
// No API to draw a GrTexture directly, so we cheat and create a private image subclass
|
|
sk_sp<SkImage> texImage(new SkImage_Gpu(sk_ref_sp(canvas->getGrContext()),
|
|
image->uniqueID(), kPremul_SkAlphaType,
|
|
std::move(proxy), image->refColorSpace()));
|
|
canvas->drawImage(texImage.get(), x, y);
|
|
}
|
|
|
|
void drawSet(SkCanvas* canvas) const {
|
|
SkMatrix matrix = SkMatrix::MakeTrans(-100, -100);
|
|
canvas->drawPicture(fPicture, &matrix, nullptr);
|
|
|
|
// Draw the tex first, so it doesn't hit a lucky cache from the raster version. This
|
|
// way we also can force the generateTexture call.
|
|
|
|
draw_as_tex(canvas, fImage.get(), 310, 0);
|
|
draw_as_tex(canvas, fImageSubset.get(), 310+101, 0);
|
|
|
|
draw_as_bitmap(canvas, fImage.get(), 150, 0);
|
|
draw_as_bitmap(canvas, fImageSubset.get(), 150+101, 0);
|
|
}
|
|
|
|
void onDraw(SkCanvas* canvas) override {
|
|
this->makeCaches(canvas->getGrContext());
|
|
|
|
canvas->translate(20, 20);
|
|
|
|
this->drawSet(canvas);
|
|
|
|
canvas->save();
|
|
canvas->translate(0, 130);
|
|
canvas->scale(0.25f, 0.25f);
|
|
this->drawSet(canvas);
|
|
canvas->restore();
|
|
|
|
canvas->save();
|
|
canvas->translate(0, 200);
|
|
canvas->scale(2, 2);
|
|
this->drawSet(canvas);
|
|
canvas->restore();
|
|
}
|
|
|
|
private:
|
|
typedef skiagm::GM INHERITED;
|
|
};
|
|
DEF_GM( return new ImageCacheratorGM("picture", make_pic_generator); )
|
|
DEF_GM( return new ImageCacheratorGM("raster", make_ras_generator); )
|
|
DEF_GM( return new ImageCacheratorGM("texture", make_tex_generator); )
|