1d1165ca65
This reverts commit 2e491a6a11
.
Reason for revert: Windows unit tests failing?
Original change's description:
> clean up (partially) colortable api
>
> Needs this to land: https://codereview.chromium.org/2789853002/
>
> Bug: skia:
> Change-Id: I38d916a546b7fa64d000d973e695ddda24a589e7
> Reviewed-on: https://skia-review.googlesource.com/10600
> Commit-Queue: Mike Reed <reed@google.com>
> Reviewed-by: Matt Sarett <msarett@google.com>
>
TBR=msarett@google.com,scroggo@google.com,reed@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I626e7edfcea82576a440dcaa851a04cedee6233f
Reviewed-on: https://skia-review.googlesource.com/10966
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
415 lines
14 KiB
C++
415 lines
14 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.h"
|
|
#include "SkCanvas.h"
|
|
#include "SkImage.h"
|
|
#include "SkImageCacherator.h"
|
|
#include "SkMakeUnique.h"
|
|
#include "SkPictureRecorder.h"
|
|
#include "SkSurface.h"
|
|
|
|
#if SK_SUPPORT_GPU
|
|
#include "GrContext.h"
|
|
#include "GrContextPriv.h"
|
|
#include "GrSurfaceContext.h"
|
|
#include "GrSurfaceProxy.h"
|
|
#include "GrTexture.h"
|
|
#include "GrTextureProxy.h"
|
|
#include "../src/image/SkImage_Gpu.h"
|
|
#endif
|
|
|
|
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) {
|
|
fBM.lockPixels();
|
|
}
|
|
protected:
|
|
bool onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes,
|
|
SkPMColor* ctable, int* ctableCount) override {
|
|
SkASSERT(fBM.width() == info.width());
|
|
SkASSERT(fBM.height() == info.height());
|
|
|
|
if (info.colorType() == kIndex_8_SkColorType) {
|
|
if (SkColorTable* ct = fBM.getColorTable()) {
|
|
if (ctable) {
|
|
memcpy(ctable, ct->readColors(), ct->count() * sizeof(SkPMColor));
|
|
}
|
|
if (ctableCount) {
|
|
*ctableCount = ct->count();
|
|
}
|
|
|
|
for (int y = 0; y < info.height(); ++y) {
|
|
memcpy(pixels, fBM.getAddr8(0, y), fBM.width());
|
|
pixels = (char*)pixels + rowBytes;
|
|
}
|
|
return true;
|
|
} else {
|
|
return false;
|
|
}
|
|
} else {
|
|
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);
|
|
}
|
|
|
|
// so we can create a color-table
|
|
static int find_closest(SkPMColor c, const SkPMColor table[], int count) {
|
|
const int cr = SkGetPackedR32(c);
|
|
const int cg = SkGetPackedG32(c);
|
|
const int cb = SkGetPackedB32(c);
|
|
|
|
int minDist = 999999999;
|
|
int index = 0;
|
|
for (int i = 0; i < count; ++i) {
|
|
int dr = SkAbs32((int)SkGetPackedR32(table[i]) - cr);
|
|
int dg = SkAbs32((int)SkGetPackedG32(table[i]) - cg);
|
|
int db = SkAbs32((int)SkGetPackedB32(table[i]) - cb);
|
|
int dist = dr + dg + db;
|
|
if (dist < minDist) {
|
|
minDist = dist;
|
|
index = i;
|
|
}
|
|
}
|
|
return index;
|
|
}
|
|
|
|
static std::unique_ptr<SkImageGenerator> make_ctable_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);
|
|
|
|
const SkPMColor colors[] = {
|
|
SkPreMultiplyColor(SK_ColorRED),
|
|
SkPreMultiplyColor(0),
|
|
SkPreMultiplyColor(SK_ColorBLUE),
|
|
};
|
|
const int count = SK_ARRAY_COUNT(colors);
|
|
SkImageInfo info = SkImageInfo::Make(100, 100, kIndex_8_SkColorType, kPremul_SkAlphaType);
|
|
|
|
SkBitmap bm2;
|
|
sk_sp<SkColorTable> ct(new SkColorTable(colors, count));
|
|
bm2.allocPixels(info, nullptr, ct.get());
|
|
for (int y = 0; y < info.height(); ++y) {
|
|
for (int x = 0; x < info.width(); ++x) {
|
|
*bm2.getAddr8(x, y) = find_closest(*bm.getAddr32(x, y), colors, count);
|
|
}
|
|
}
|
|
return skstd::make_unique<RasterGenerator>(bm2);
|
|
}
|
|
|
|
class EmptyGenerator : public SkImageGenerator {
|
|
public:
|
|
EmptyGenerator(const SkImageInfo& info) : SkImageGenerator(info) {}
|
|
};
|
|
|
|
#if SK_SUPPORT_GPU
|
|
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::kNo, info));
|
|
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();
|
|
}
|
|
}
|
|
protected:
|
|
sk_sp<GrTextureProxy> onGenerateTexture(GrContext* ctx, const SkImageInfo& info,
|
|
const SkIPoint& origin) 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;
|
|
}
|
|
|
|
// need to copy the subset into a new texture
|
|
GrSurfaceDesc desc = fProxy->desc();
|
|
desc.fWidth = info.width();
|
|
desc.fHeight = info.height();
|
|
|
|
sk_sp<GrSurfaceContext> dstContext(fCtx->contextPriv().makeDeferredSurfaceContext(
|
|
desc,
|
|
SkBackingFit::kExact,
|
|
SkBudgeted::kNo));
|
|
if (!dstContext) {
|
|
return nullptr;
|
|
}
|
|
|
|
if (!dstContext->copy(
|
|
fProxy.get(),
|
|
SkIRect::MakeXYWH(origin.x(), origin.y(), info.width(), info.height()),
|
|
SkIPoint::Make(0, 0))) {
|
|
return nullptr;
|
|
}
|
|
|
|
return dstContext->asTextureProxyRef();
|
|
}
|
|
|
|
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);
|
|
}
|
|
#endif
|
|
|
|
class ImageCacheratorGM : public skiagm::GM {
|
|
SkString fName;
|
|
std::unique_ptr<SkImageGenerator> (*fFactory)(GrContext*, sk_sp<SkPicture>);
|
|
sk_sp<SkPicture> fPicture;
|
|
std::unique_ptr<SkImageCacherator> fCache;
|
|
std::unique_ptr<SkImageCacherator> fCacheSubset;
|
|
|
|
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);
|
|
SkDEBUGCODE(const uint32_t genID = gen->uniqueID();)
|
|
fCache.reset(SkImageCacherator::NewFromGenerator(std::move(gen)));
|
|
|
|
const SkIRect subset = SkIRect::MakeLTRB(50, 50, 100, 100);
|
|
|
|
gen = fFactory(ctx, fPicture);
|
|
SkDEBUGCODE(const uint32_t genSubsetID = gen->uniqueID();)
|
|
fCacheSubset.reset(SkImageCacherator::NewFromGenerator(std::move(gen), &subset));
|
|
|
|
// whole caches should have the same ID as the generator. Subsets should be diff
|
|
SkASSERT(fCache->uniqueID() == genID);
|
|
SkASSERT(fCacheSubset->uniqueID() != genID);
|
|
SkASSERT(fCacheSubset->uniqueID() != genSubsetID);
|
|
|
|
SkASSERT(fCache->info().dimensions() == SkISize::Make(100, 100));
|
|
SkASSERT(fCacheSubset->info().dimensions() == SkISize::Make(50, 50));
|
|
}
|
|
|
|
static void draw_as_bitmap(SkCanvas* canvas, SkImageCacherator* cache, SkScalar x, SkScalar y) {
|
|
SkBitmap bitmap;
|
|
cache->lockAsBitmap(canvas->getGrContext(), &bitmap, nullptr,
|
|
canvas->imageInfo().colorSpace());
|
|
canvas->drawBitmap(bitmap, x, y);
|
|
}
|
|
|
|
static void draw_as_tex(SkCanvas* canvas, SkImageCacherator* cache, SkScalar x, SkScalar y) {
|
|
#if SK_SUPPORT_GPU
|
|
sk_sp<SkColorSpace> texColorSpace;
|
|
sk_sp<GrTextureProxy> proxy(
|
|
cache->lockAsTextureProxy(canvas->getGrContext(), GrSamplerParams::ClampBilerp(),
|
|
canvas->imageInfo().colorSpace(), &texColorSpace,
|
|
nullptr, nullptr));
|
|
if (!proxy) {
|
|
// show placeholder if we have no texture
|
|
SkPaint paint;
|
|
paint.setStyle(SkPaint::kStroke_Style);
|
|
SkRect r = SkRect::MakeXYWH(x, y, SkIntToScalar(cache->info().width()),
|
|
SkIntToScalar(cache->info().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> image(new SkImage_Gpu(canvas->getGrContext(),
|
|
cache->uniqueID(), kPremul_SkAlphaType,
|
|
std::move(proxy), std::move(texColorSpace),
|
|
SkBudgeted::kNo));
|
|
canvas->drawImage(image.get(), x, y);
|
|
#endif
|
|
}
|
|
|
|
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, fCache.get(), 310, 0);
|
|
draw_as_tex(canvas, fCacheSubset.get(), 310+101, 0);
|
|
|
|
draw_as_bitmap(canvas, fCache.get(), 150, 0);
|
|
draw_as_bitmap(canvas, fCacheSubset.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("ctable", make_ctable_generator); )
|
|
#if SK_SUPPORT_GPU
|
|
DEF_GM( return new ImageCacheratorGM("texture", make_tex_generator); )
|
|
#endif
|