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

Revert "Remove use of makeDeferredRenderTargetContextWithFallback"

Browse Source 
This reverts commit 155b29224d.

Reason for revert: 

https://skia-review.googlesource.com/c/5541/ (Second part of piecemeal revert) seems to have zeroed in on the change that caused the perf regression. Let's see if the changes reverted in this CL are acceptable.

Change-Id: I477fe23d84a9c14f87a431ec2b495f617ff410be
Reviewed-on: https://skia-review.googlesource.com/5573
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
This commit is contained in:
Robert Phillips 2016-12-05 13:18:47 +00:00 committed by Skia Commit-Bot
parent b048e81c5c
commit 55360b11c7
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/effects/SkAlphaThresholdFilter.cpp
View File

@ -100,7 +100,7 @@ sk_sp<GrTextureProxy> SkAlphaThresholdFilterImpl::createMaskTexture(GrContext* c
const SkMatrix& inMatrix, const SkMatrix& inMatrix,
const SkIRect& bounds) const { const SkIRect& bounds) const {
sk_sp<GrRenderTargetContext> rtContext(context->makeRenderTargetContextWithFallback( sk_sp<GrRenderTargetContext> rtContext(context->makeDeferredRenderTargetContextWithFallback(
SkBackingFit::kApprox, bounds.width(), bounds.height(), kAlpha_8_GrPixelConfig, nullptr)); SkBackingFit::kApprox, bounds.width(), bounds.height(), kAlpha_8_GrPixelConfig, nullptr));
if (!rtContext) { if (!rtContext) {
return nullptr; return nullptr;

2
src/effects/SkBlurMaskFilter.cpp
View File

@ -1122,7 +1122,7 @@ static sk_sp<GrTexture> find_or_create_rrect_blur_mask(GrContext* context,
sk_sp<GrTexture> mask(context->textureProvider()->findAndRefTextureByUniqueKey(key)); sk_sp<GrTexture> mask(context->textureProvider()->findAndRefTextureByUniqueKey(key));
if (!mask) { if (!mask) {
// TODO: this could be approx but the texture coords will need to be updated // TODO: this could be approx but the texture coords will need to be updated
sk_sp<GrRenderTargetContext> rtc(context->makeRenderTargetContextWithFallback( sk_sp<GrRenderTargetContext> rtc(context->makeDeferredRenderTargetContextWithFallback(
SkBackingFit::kExact, size.fWidth, size.fHeight, kAlpha_8_GrPixelConfig, nullptr)); SkBackingFit::kExact, size.fWidth, size.fHeight, kAlpha_8_GrPixelConfig, nullptr));
if (!rtc) { if (!rtc) {
return nullptr; return nullptr;

2
src/gpu/GrBlurUtils.cpp
View File

@ -104,7 +104,7 @@ static sk_sp<GrTextureProxy> create_mask_GPU(GrContext* context,
sampleCnt = 0; sampleCnt = 0;
} }
sk_sp<GrRenderTargetContext> rtContext(context->makeRenderTargetContextWithFallback( sk_sp<GrRenderTargetContext> rtContext(context->makeDeferredRenderTargetContextWithFallback(
SkBackingFit::kApprox, maskRect.width(), maskRect.height(), kAlpha_8_GrPixelConfig, nullptr, SkBackingFit::kApprox, maskRect.width(), maskRect.height(), kAlpha_8_GrPixelConfig, nullptr,
sampleCnt)); sampleCnt));
if (!rtContext) { if (!rtContext) {