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

Revert of Re-enable CPU mipmap generation for Ganesh. Aniso mips were landed a while ago. However, the CPU bu… (patchset #1 id:1 of https://codereview.chromium.org/1835003002/ )

Browse Source 
Reason for revert:
Speculative - seems likely to be the results of nanobench crashes on several bots.

Original issue's description:
> Re-enable CPU mipmap generation for Ganesh. Aniso mips were landed a while ago. However, the CPU builder fails when it sees Index8 (among other things), so change the code to fallback to GPU in that case. Additionally, if we're going to be mipping an sRGB image, don't use the CPU code (which is not yet gamma correct). Unfortunately, this means that we will often be using the GPU path, still - with recent codec changes, most images are coming in tagged as sRGB.
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1835003002
>
> Committed: https://skia.googlesource.com/skia/+/b0ac1af7fab467aacbc27d20d14a09bcb960472f

TBR=reed@google.com,bsalomon@google.com,cblume@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Review URL: https://codereview.chromium.org/1836563002
This commit is contained in:
brianosman 2016-03-25 11:54:32 -07:00 committed by Commit bot
parent d096459b2b
commit b3c9e4faaa
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/SkImageCacherator.cpp
View File

@ -303,10 +303,11 @@ GrTexture* SkImageCacherator::lockTexture(GrContext* ctx, const GrUniqueKey& key
SkBitmap bitmap; SkBitmap bitmap;
if (this->tryLockAsBitmap(&bitmap, client, chint)) { if (this->tryLockAsBitmap(&bitmap, client, chint)) {
GrTexture* tex = nullptr; GrTexture* tex = nullptr;
// disable mipmapping until we generate anisotropic mipmap levels
willBeMipped = false;
if (willBeMipped) { if (willBeMipped) {
tex = GrGenerateMipMapsAndUploadToTexture(ctx, bitmap); tex = GrGenerateMipMapsAndUploadToTexture(ctx, bitmap);
} } else {
if (!tex) {
tex = GrUploadBitmapToTexture(ctx, bitmap); tex = GrUploadBitmapToTexture(ctx, bitmap);
} }
if (tex) { if (tex) {

5
src/gpu/GrImageIDTextureAdjuster.cpp
View File

@ -90,10 +90,11 @@ GrTexture* GrBitmapTextureMaker::refOriginalTexture(bool willBeMipped) {
return tex; return tex;
} }
} }
// disable mipmapping until we generate anisotropic mipmap levels
willBeMipped = false;
if (willBeMipped) { if (willBeMipped) {
tex = GrGenerateMipMapsAndUploadToTexture(this->context(), fBitmap); tex = GrGenerateMipMapsAndUploadToTexture(this->context(), fBitmap);
} } else {
if (!tex) {
tex = GrUploadBitmapToTexture(this->context(), fBitmap); tex = GrUploadBitmapToTexture(this->context(), fBitmap);
} }
if (tex && fOriginalKey.isValid()) { if (tex && fOriginalKey.isValid()) {

6
src/gpu/SkGr.cpp
View File

@ -344,12 +344,6 @@ GrTexture* GrGenerateMipMapsAndUploadToTexture(GrContext* ctx, const SkBitmap& b
return texture; return texture;
} }
// SkMipMap::Build doesn't handle sRGB data correctly (yet).
// Failover to the GL code-path for now.
if (kLinear_SkColorProfileType != bitmap.profileType()) {
return nullptr;
}
SkASSERT(sizeof(int) <= sizeof(uint32_t)); SkASSERT(sizeof(int) <= sizeof(uint32_t));
if (bitmap.width() < 0 || bitmap.height() < 0) { if (bitmap.width() < 0 || bitmap.height() < 0) {
return nullptr; return nullptr;