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

Fix .fp files

Browse Source 
This fixes the failures in https://skia-review.googlesource.com/c/skia/+/112262 (Move internal calls from GrContext to GrContextPriv)

TBR=egdaniel@google.com
Change-Id: I4b7223f6795a50d8c3848992af6d52812b282db9
Reviewed-on: https://skia-review.googlesource.com/112480
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
This commit is contained in:
Robert Phillips 2018-03-06 09:59:39 -05:00 committed by Skia Commit-Bot
parent ba8feb56c3
commit 8bac928009
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/gpu/effects/GrConfigConversionEffect.fp
View File

@ -38,14 +38,14 @@
const SkImageInfo ii = SkImageInfo::Make(kSize, kSize, const SkImageInfo ii = SkImageInfo::Make(kSize, kSize,
kRGBA_8888_SkColorType, kPremul_SkAlphaType); kRGBA_8888_SkColorType, kPremul_SkAlphaType);
sk_sp<GrRenderTargetContext> readRTC(context->makeDeferredRenderTargetContext( sk_sp<GrRenderTargetContext> readRTC(
SkBackingFit::kExact, context->contextPriv().makeDeferredRenderTargetContext(SkBackingFit::kExact,
kSize, kSize, kSize, kSize,
kConfig, nullptr)); kConfig, nullptr));
sk_sp<GrRenderTargetContext> tempRTC(context->makeDeferredRenderTargetContext( sk_sp<GrRenderTargetContext> tempRTC(
SkBackingFit::kExact, context->contextPriv().makeDeferredRenderTargetContext(SkBackingFit::kExact,
kSize, kSize, kSize, kSize,
kConfig, nullptr)); kConfig, nullptr));
if (!readRTC || !readRTC->asTextureProxy() || !tempRTC) { if (!readRTC || !readRTC->asTextureProxy() || !tempRTC) {
return false; return false;
} }

6
src/gpu/effects/GrRRectBlurEffect.fp
View File

@ -52,8 +52,10 @@ uniform half blurRadius;
key, kBottomLeft_GrSurfaceOrigin)); key, kBottomLeft_GrSurfaceOrigin));
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->makeDeferredRenderTargetContextWithFallback( sk_sp<GrRenderTargetContext> rtc(
SkBackingFit::kExact, size.fWidth, size.fHeight, kAlpha_8_GrPixelConfig, nullptr)); context->contextPriv().makeDeferredRenderTargetContextWithFallback(
SkBackingFit::kExact, size.fWidth, size.fHeight,
kAlpha_8_GrPixelConfig, nullptr));
if (!rtc) { if (!rtc) {
return nullptr; return nullptr;
} }

6
src/gpu/effects/GrRRectBlurEffect.h
View File

@ -54,9 +54,9 @@ public:
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( sk_sp<GrRenderTargetContext> rtc(
context->contextPriv().makeDeferredRenderTargetContextWithFallback( context->contextPriv().makeDeferredRenderTargetContextWithFallback(
SkBackingFit::kExact, size.fWidth, size.fHeight, kAlpha_8_GrPixelConfig, SkBackingFit::kExact, size.fWidth, size.fHeight, kAlpha_8_GrPixelConfig,
nullptr)); nullptr));
if (!rtc) { if (!rtc) {
return nullptr; return nullptr;
} }