AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hide legacy scalePixels and makeShader

Browse Source 
Change-Id: Idae1e44aa0417adb943fd20112fb4f1fa81167f2
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/337719
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
This commit is contained in:
Mike Reed 2020-11-23 17:41:35 -05:00 committed by Skia Commit-Bot
parent 26e1073885
commit ce0c876ce2
14 changed files with 50 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/examples/Image_scalePixels.cpp
View File

@ -15,7 +15,7 @@ void draw(SkCanvas* canvas) {
SkFilterQuality qualities[] = { kNone_SkFilterQuality, kLow_SkFilterQuality,
kMedium_SkFilterQuality, kHigh_SkFilterQuality };
for (unsigned index = 0; index < SK_ARRAY_COUNT(qualities); ++index) {
image->scalePixels(pixmap, qualities[index]);
image->scalePixels(pixmap, SkSamplingOptions(qualities[index]));
sk_sp<SkImage> filtered = SkImage::MakeFromRaster(pixmap, nullptr, nullptr);
canvas->drawImage(filtered, 16 * index, 0);
}

3
docs/examples/Pixmap_scalePixels.cpp
View File

@ -16,7 +16,8 @@ void draw(SkCanvas* canvas) {
std::vector<int32_t> dstPixels;
dstPixels.resize(image->height() * rowBytes);
SkPixmap dstmap(info, &dstPixels.front(), rowBytes);
pixmap.scalePixels(dstmap, kMedium_SkFilterQuality);
pixmap.scalePixels(dstmap, SkSamplingOptions(SkFilterMode::kLinear,
SkMipmapMode::kNearest));
SkBitmap bitmap;
bitmap.installPixels(dstmap);
canvas->translate(32, 32);

4
gm/image.cpp
View File

@ -204,7 +204,7 @@ static void show_scaled_pixels(SkCanvas* canvas, SkImage* image) {
for (auto ch : chints) {
canvas->save();
for (auto q : qualities) {
if (image->scalePixels(storage, q, ch)) {
if (image->scalePixels(storage, SkSamplingOptions(q), ch)) {
draw_pixmap(canvas, storage);
}
canvas->translate(70, 0);
@ -407,7 +407,7 @@ DEF_SIMPLE_GM(scalepixels_unpremul, canvas, 1080, 280) {
};
for (auto fq : qualities) {
pm.scalePixels(pm2, fq);
pm.scalePixels(pm2, SkSamplingOptions(fq));
slam_ff(pm2);
draw_pixmap(canvas, pm2, 10, 10);
canvas->translate(pm2.width() + 10.0f, 0);

3
gm/localmatrixshader.cpp
View File

@ -117,7 +117,8 @@ DEF_SIMPLE_GM(localmatrixshader_persp, canvas, 542, 266) {
SkBitmap downsized;
downsized.allocPixels(image->imageInfo().makeWH(128, 128));
image->scalePixels(downsized.pixmap(), kLow_SkFilterQuality);
image->scalePixels(downsized.pixmap(), SkSamplingOptions(SkFilterMode::kLinear,
SkMipmapMode::kNone));
image = SkImage::MakeFromBitmap(downsized);
SkRect imgRect = SkRect::MakeIWH(image->width(), image->height());

1
gn/flutter_defines.gni
View File

@ -18,6 +18,7 @@ flutter_defines = [
"SK_SUPPORT_LEGACY_MATRIX_FACTORIES",
"SK_SUPPORT_LEGACY_ADJUSTHQHEURISTIC",
"SK_SUPPORT_LEGACY_ONDRAWIMAGERECT",
"SK_SUPPORT_LEGACY_SCALEPIXELS_PARAM",
# Fast low-precision software rendering isn't a priority for Flutter.
"SK_DISABLE_LEGACY_SHADERCONTEXT",

22
include/core/SkImage.h
View File

@ -701,8 +701,12 @@ public:
return this->makeShader(tmx, tmy, &localMatrix);
}
#ifdef SK_SUPPORT_LEGACY_SCALEPIXELS_PARAM
sk_sp<SkShader> makeShader(SkTileMode tmx, SkTileMode tmy, const SkMatrix* localMatrix,
SkFilterQuality) const;
SkFilterQuality fq) const {
return this->makeShader(tmx, tmy, SkSamplingOptions(fq), localMatrix);
}
#endif
/** Creates SkShader from SkImage. SkShader dimensions are taken from SkImage. SkShader uses
SkShader::kClamp_TileMode to fill drawn area outside SkImage. localMatrix permits
@ -1003,22 +1007,22 @@ public:
match. If SkImage SkColorSpace is nullptr, dst.colorSpace() must match. Returns
false if pixel conversion is not possible.
Scales the image, with filterQuality, to match dst.width() and dst.height().
filterQuality kNone_SkFilterQuality is fastest, typically implemented with
nearest neighbor filter. kLow_SkFilterQuality is typically implemented with
bilerp filter. kMedium_SkFilterQuality is typically implemented with
bilerp filter, and mip-map filter when size is reduced.
kHigh_SkFilterQuality is slowest, typically implemented with bicubic filter.
If cachingHint is kAllow_CachingHint, pixels may be retained locally.
If cachingHint is kDisallow_CachingHint, pixels are not added to the local cache.
@param dst destination SkPixmap: SkImageInfo, pixels, row bytes
@return true if pixels are scaled to fit dst
*/
bool scalePixels(const SkPixmap& dst, SkFilterQuality filterQuality,
bool scalePixels(const SkPixmap& dst, const SkSamplingOptions&,
CachingHint cachingHint = kAllow_CachingHint) const;
#ifdef SK_SUPPORT_LEGACY_SCALEPIXELS_PARAM
bool scalePixels(const SkPixmap& dst, SkFilterQuality fq,
CachingHint cachingHint = kAllow_CachingHint) const {
return this->scalePixels(dst, SkSamplingOptions(fq), cachingHint);
}
#endif
/** Encodes SkImage pixels, returning result as SkData.
Returns nullptr if encoding fails, or if encodedImageFormat is not supported.

18
include/core/SkPixmap.h
View File

@ -11,6 +11,11 @@
#include "include/core/SkColor.h"
#include "include/core/SkFilterQuality.h"
#include "include/core/SkImageInfo.h"
#include "include/core/SkSamplingOptions.h"
#ifndef SK_SUPPORT_LEGACY_SCALEPIXELS_PARAM
#define SK_SUPPORT_LEGACY_SCALEPIXELS_PARAM
#endif
class SkData;
struct SkMask;
@ -654,19 +659,16 @@ public:
Returns false if SkBitmap width() or height() is zero or negative.
Scales the image, with filterQuality, to match dst.width() and dst.height().
filterQuality kNone_SkFilterQuality is fastest, typically implemented with
nearest neighbor filter. kLow_SkFilterQuality is typically implemented with
bilerp filter. kMedium_SkFilterQuality is typically implemented with
bilerp filter, and mip-map filter when size is reduced.
kHigh_SkFilterQuality is slowest, typically implemented with bicubic filter.
@param dst SkImageInfo and pixel address to write to
@return true if pixels are scaled to fit dst
example: https://fiddle.skia.org/c/@Pixmap_scalePixels
*/
bool scalePixels(const SkPixmap& dst, SkFilterQuality filterQuality) const;
bool scalePixels(const SkPixmap& dst, const SkSamplingOptions&) const;
#ifdef SK_SUPPORT_LEGACY_SCALEPIXELS_PARAM
bool scalePixels(const SkPixmap& dst, SkFilterQuality fq) const;
#endif
/** Writes color to pixels bounded by subset; returns true on success.
Returns false if colorType() is kUnknown_SkColorType, or if subset does

2
include/core/SkSamplingOptions.h
View File

@ -42,7 +42,7 @@ struct SkCubicResampler {
float B, C;
};
struct SkSamplingOptions {
struct SK_API SkSamplingOptions {
bool fUseCubic = false;
SkCubicResampler fCubic = {0, 0};
SkFilterMode fFilter = SkFilterMode::kNearest;

3
modules/skresources/src/SkResources.cpp
View File

@ -124,7 +124,8 @@ sk_sp<SkImage> MultiFrameImageAsset::generateFrame(float t) {
SkBitmap bm;
if (bm.tryAllocPixels(info, info.minRowBytes()) &&
image->scalePixels(bm.pixmap(),
SkFilterQuality::kMedium_SkFilterQuality,
SkSamplingOptions(SkFilterMode::kLinear,
SkMipmapMode::kNearest),
SkImage::kDisallow_CachingHint)) {
image = SkImage::MakeFromBitmap(bm);
}

11
src/core/SkPixmap.cpp
View File

@ -197,7 +197,7 @@ bool SkPixmap::erase(const SkColor4f& color, SkColorSpace* cs, const SkIRect* su
return true;
}
bool SkPixmap::scalePixels(const SkPixmap& actualDst, SkFilterQuality quality) const {
bool SkPixmap::scalePixels(const SkPixmap& actualDst, const SkSamplingOptions& sampling) const {
// We may need to tweak how we interpret these just a little below, so we make copies.
SkPixmap src = *this,
dst = actualDst;
@ -238,8 +238,6 @@ bool SkPixmap::scalePixels(const SkPixmap& actualDst, SkFilterQuality quality) c
SkRect::Make(dst.bounds()),
SkMatrix::kFill_ScaleToFit);
// We'll create a shader to do this draw so we have control over the bicubic clamp.
auto sampling = SkSamplingOptions(quality);
sk_sp<SkShader> shader = SkImageShader::Make(SkImage::MakeFromBitmap(bitmap),
SkTileMode::kClamp,
SkTileMode::kClamp,
@ -256,12 +254,17 @@ bool SkPixmap::scalePixels(const SkPixmap& actualDst, SkFilterQuality quality) c
SkPaint paint;
paint.setBlendMode(SkBlendMode::kSrc);
paint.setFilterQuality(quality);
paint.setShader(std::move(shader));
surface->getCanvas()->drawPaint(paint);
return true;
}
#ifdef SK_SUPPORT_LEGACY_SCALEPIXELS_PARAM
bool SkPixmap::scalePixels(const SkPixmap& dst, SkFilterQuality fq) const {
return this->scalePixels(dst, SkSamplingOptions(fq));
}
#endif
//////////////////////////////////////////////////////////////////////////////////////////////////
SkColor SkPixmap::getColor(int x, int y) const {

12
src/image/SkImage.cpp
View File

@ -102,7 +102,8 @@ void SkImage::asyncRescaleAndReadPixelsYUV420(SkYUVColorSpace yuvColorSpace,
context);
}
bool SkImage::scalePixels(const SkPixmap& dst, SkFilterQuality quality, CachingHint chint) const {
bool SkImage::scalePixels(const SkPixmap& dst, const SkSamplingOptions& sampling,
CachingHint chint) const {
// Context TODO: Elevate GrDirectContext requirement to public API.
auto dContext = as_IB(this)->directContext();
if (this->width() == dst.width() && this->height() == dst.height()) {
@ -119,7 +120,7 @@ bool SkImage::scalePixels(const SkPixmap& dst, SkFilterQuality quality, CachingH
// is (currently) only being applied to the getROPixels. If we get a request to
// also attempt to cache the final (scaled) result, we would add that logic here.
//
return bm.peekPixels(&pmap) && pmap.scalePixels(dst, quality);
return bm.peekPixels(&pmap) && pmap.scalePixels(dst, sampling);
}
return false;
}
@ -148,13 +149,6 @@ sk_sp<SkShader> SkImage::makeShader(SkTileMode tmx, SkTileMode tmy,
&sampling, localMatrix);
}
sk_sp<SkShader> SkImage::makeShader(SkTileMode tmx, SkTileMode tmy,
const SkMatrix* localMatrix, SkFilterQuality filtering) const {
auto sampling = SkSamplingOptions(filtering);
return SkImageShader::Make(sk_ref_sp(const_cast<SkImage*>(this)), tmx, tmy, &sampling,
localMatrix);
}
sk_sp<SkData> SkImage::encodeToData(SkEncodedImageFormat type, int quality) const {
// Context TODO: Elevate GrDirectContext requirement to public API.
auto dContext = as_IB(this)->directContext();

3
src/image/SkImage_Gpu.cpp
View File

@ -516,7 +516,8 @@ sk_sp<SkImage> SkImage::MakeCrossContextFromPixmap(GrDirectContext* dContext,
int newWidth = std::min(static_cast<int>(originalPixmap.width() * scale), maxTextureSize);
int newHeight = std::min(static_cast<int>(originalPixmap.height() * scale), maxTextureSize);
SkImageInfo info = originalPixmap.info().makeWH(newWidth, newHeight);
if (!resized.tryAlloc(info) || !originalPixmap.scalePixels(resized, kLow_SkFilterQuality)) {
SkSamplingOptions sampling(SkFilterMode::kLinear, SkMipmapMode::kNone);
if (!resized.tryAlloc(info) || !originalPixmap.scalePixels(resized, sampling)) {
return nullptr;
}
pixmap = &resized;

3
src/image/SkImage_GpuYUVA.cpp
View File

@ -343,7 +343,8 @@ sk_sp<SkImage> SkImage::MakeFromYUVAPixmaps(GrRecordingContext* context,
int newWidth = std::min(static_cast<int>(pixmap->width() *scale), maxTextureSize);
int newHeight = std::min(static_cast<int>(pixmap->height()*scale), maxTextureSize);
SkImageInfo info = pixmap->info().makeWH(newWidth, newHeight);
if (!resized.tryAlloc(info) || !pixmap->scalePixels(resized, kLow_SkFilterQuality)) {
SkSamplingOptions sampling(SkFilterMode::kLinear, SkMipmapMode::kNone);
if (!resized.tryAlloc(info) || !pixmap->scalePixels(resized, sampling)) {
return nullptr;
}
pixmap = &resized;

3
tests/ShaderOpacityTest.cpp
View File

@ -131,7 +131,8 @@ DEF_TEST(image_shader_filtering, reporter) {
for (auto scale : scales) {
SkMatrix m = SkMatrix::Scale(scale, scale);
paint.setFilterQuality(kNone_SkFilterQuality); // this setting should be ignored
paint.setShader(img->makeShader(SkTileMode::kRepeat, SkTileMode::kRepeat, &m, q));
paint.setShader(img->makeShader(SkTileMode::kRepeat, SkTileMode::kRepeat,
SkSamplingOptions(q), &m));
auto img0 = make_img(paint);
paint.setFilterQuality(q); // this should (still) be ignored