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

Use raster mipmap levels when drawing to GPU.

Browse Source 
Previously just the base level was uploaded and the level contents
were generated on the GPU.

showmiplevels_explicit now works on GPU.

Bug: skia:11983
Change-Id: I96ed8a7ad90a8252f55a736cb6146eec9b2a3ad1
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/521356
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
This commit is contained in:
Brian Salomon 2022-04-15 09:06:52 -04:00 committed by SkCQ
parent fcbf28849b
commit 84e2586f15
4 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gm/showmiplevels.cpp
View File

@ -48,11 +48,6 @@ class ShowMipLevels3 : public skiagm::GM {
}
DrawResult onDraw(SkCanvas* canvas, SkString*) override {
if (canvas->recordingContext()) {
// mips not supported yet
return DrawResult::kSkip;
}
canvas->drawColor(0xFFDDDDDD);
canvas->translate(10, 10);

1
include/core/SkBitmap.h
View File

@ -1191,6 +1191,7 @@ private:
friend class SkImage_Raster;
friend class SkReadBuffer; // unflatten
friend class GrProxyProvider; // fMips
};
///////////////////////////////////////////////////////////////////////////////

27
src/gpu/ganesh/GrProxyProvider.cpp
View File

@ -269,11 +269,11 @@ GrSurfaceProxyView GrProxyProvider::findCachedProxyWithColorTypeFallback(
}
sk_sp<GrTextureProxy> GrProxyProvider::createProxyFromBitmap(const SkBitmap& bitmap,
GrMipmapped mipMapped,
GrMipmapped mipmapped,
SkBackingFit fit,
SkBudgeted budgeted) {
ASSERT_SINGLE_OWNER
SkASSERT(fit == SkBackingFit::kExact || mipMapped == GrMipmapped::kNo);
SkASSERT(fit == SkBackingFit::kExact || mipmapped == GrMipmapped::kNo);
if (this->isAbandoned()) {
return nullptr;
@ -296,12 +296,22 @@ sk_sp<GrTextureProxy> GrProxyProvider::createProxyFromBitmap(const SkBitmap& bit
if (!bitmap.readPixels(copyBitmap.pixmap())) {
return nullptr;
}
if (mipmapped == GrMipmapped::kYes && bitmap.fMips) {
copyBitmap.fMips = sk_sp<SkMipmap>(SkMipmap::Build(copyBitmap.pixmap(),
nullptr,
false));
for (int i = 0; i < copyBitmap.fMips->countLevels(); ++i) {
SkMipmap::Level src, dst;
bitmap.fMips->getLevel(i, &src);
copyBitmap.fMips->getLevel(i, &dst);
src.fPixmap.readPixels(dst.fPixmap);
}
}
copyBitmap.setImmutable();
}
sk_sp<GrTextureProxy> proxy;
if (mipMapped == GrMipmapped::kNo ||
0 == SkMipmap::ComputeLevelCount(copyBitmap.width(), copyBitmap.height())) {
if (mipmapped == GrMipmapped::kNo || !SkMipmap::ComputeLevelCount(copyBitmap.dimensions())) {
proxy = this->createNonMippedProxyFromBitmap(copyBitmap, fit, budgeted);
} else {
proxy = this->createMippedProxyFromBitmap(copyBitmap, budgeted);
@ -372,9 +382,12 @@ sk_sp<GrTextureProxy> GrProxyProvider::createMippedProxyFromBitmap(const SkBitma
return nullptr;
}
sk_sp<SkMipmap> mipmaps(SkMipmap::Build(bitmap.pixmap(), nullptr));
sk_sp<SkMipmap> mipmaps = bitmap.fMips;
if (!mipmaps) {
return nullptr;
mipmaps.reset(SkMipmap::Build(bitmap.pixmap(), nullptr));
if (!mipmaps) {
return nullptr;
}
}
auto dims = bitmap.dimensions();
@ -404,7 +417,7 @@ sk_sp<GrTextureProxy> GrProxyProvider::createMippedProxyFromBitmap(const SkBitma
GrRenderable::kNo,
1,
desc.fBudgeted,
GrMipMapped::kYes,
GrMipmapped::kYes,
GrProtected::kNo,
texels.get()));
},

9
src/image/SkImage_Raster.cpp
View File

@ -444,7 +444,7 @@ std::tuple<GrSurfaceProxyView, GrColorType> SkImage_Raster::onAsView(
if (fPinnedView) {
// We ignore the mipmap request here. If the pinned view isn't mipmapped then we will
// fallback to bilinear. The pin API is used by Android Framework which does not expose
// mipmapping.Moreover, we're moving towards requiring that images be made with mip levels
// mipmapping .Moreover, we're moving towards requiring that images be made with mip levels
// if mipmapping is desired (skbug.com/10411)
mipmapped = GrMipmapped::kNo;
if (policy != GrImageTexGenPolicy::kDraw) {
@ -453,6 +453,13 @@ std::tuple<GrSurfaceProxyView, GrColorType> SkImage_Raster::onAsView(
return {fPinnedView, fPinnedColorType};
}
if (policy == GrImageTexGenPolicy::kDraw) {
// If the draw doesn't require mipmaps but this SkImage has them go ahead and make a
// mipmapped texture. There are three reasons for this:
// 1) Avoiding another texture creation if a later draw requires mipmaps.
// 2) Ensuring we upload the bitmap's levels instead of generating on the GPU from the base.
if (this->hasMipmaps()) {
mipmapped = GrMipmapped::kYes;
}
return GrMakeCachedBitmapProxyView(rContext, fBitmap, mipmapped);
}
auto budgeted = (policy == GrImageTexGenPolicy::kNew_Uncached_Unbudgeted)