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

SkPictureShader: scale down if width or height is larger than maxTextureSize

Browse Source 
Grdient renders black because of failure onCreateTexture
if one of width or height is larger than maxTextureSize
with --force-gpu-rasterization.

BUG=chromium:473166

Review URL: https://codereview.chromium.org/1101513004
This commit is contained in:
gen.kim 2015-05-03 22:36:30 -07:00 committed by Commit bot
parent 05f7d5cbd8
commit b9ed884578
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/core/SkPictureShader.cpp
View File

@ -141,7 +141,8 @@ void SkPictureShader::flatten(SkWriteBuffer& buffer) const {
fPicture->flatten(buffer);
}
SkShader* SkPictureShader::refBitmapShader(const SkMatrix& matrix, const SkMatrix* localM) const {
SkShader* SkPictureShader::refBitmapShader(const SkMatrix& matrix, const SkMatrix* localM,
const int maxTextureSize) const {
SkASSERT(fPicture && !fPicture->cullRect().isEmpty());
SkMatrix m;
@ -171,6 +172,17 @@ SkShader* SkPictureShader::refBitmapShader(const SkMatrix& matrix, const SkMatri
scaledSize.set(SkScalarMul(scaledSize.width(), clampScale),
SkScalarMul(scaledSize.height(), clampScale));
}
#if SK_SUPPORT_GPU
// Scale down the tile size if larger than maxTextureSize for GPU Path or it should fail on create texture
if (maxTextureSize) {
if (scaledSize.width() > maxTextureSize || scaledSize.height() > maxTextureSize) {
SkScalar downScale = SkScalarDiv(maxTextureSize,
SkMax32(scaledSize.width(), scaledSize.height()));
scaledSize.set(SkScalarMul(scaledSize.width(), downScale),
SkScalarMul(scaledSize.height(), downScale));
}
}
#endif
SkISize tileSize = scaledSize.toRound();
if (tileSize.isEmpty()) {
@ -299,7 +311,11 @@ bool SkPictureShader::asFragmentProcessor(GrContext* context, const SkPaint& pai
const SkMatrix& viewM, const SkMatrix* localMatrix,
GrColor* paintColor,
GrFragmentProcessor** fp) const {
SkAutoTUnref<SkShader> bitmapShader(this->refBitmapShader(viewM, localMatrix));
int maxTextureSize = 0;
if (context) {
maxTextureSize = context->getMaxTextureSize();
}
SkAutoTUnref<SkShader> bitmapShader(this->refBitmapShader(viewM, localMatrix, maxTextureSize));
if (!bitmapShader) {
return false;
}

2
src/core/SkPictureShader.h
View File

@ -41,7 +41,7 @@ protected:
private:
SkPictureShader(const SkPicture*, TileMode, TileMode, const SkMatrix*, const SkRect*);
SkShader* refBitmapShader(const SkMatrix&, const SkMatrix* localMatrix) const;
SkShader* refBitmapShader(const SkMatrix&, const SkMatrix* localMatrix, const int maxTextureSize = 0) const;
const SkPicture* fPicture;
SkRect fTile;