diff options
Diffstat (limited to 'gm')
| -rw-r--r-- | gm/flippity.cpp | 8 | ||||
| -rw-r--r-- | gm/texdata.cpp | 7 | ||||
| -rw-r--r-- | gm/texturedomaineffect.cpp | 10 | ||||
| -rw-r--r-- | gm/yuvtorgbeffect.cpp | 5 |
4 files changed, 18 insertions, 12 deletions
diff --git a/gm/flippity.cpp b/gm/flippity.cpp index f4358382c3..93813b943f 100644 --- a/gm/flippity.cpp +++ b/gm/flippity.cpp @@ -12,6 +12,7 @@ #if SK_SUPPORT_GPU +#include "GrContextPriv.h" #include "SkImage_Gpu.h" static const int kNumMatrices = 6; @@ -129,9 +130,10 @@ static sk_sp<SkImage> make_reference_image(GrContext* context, } } - sk_sp<GrTextureProxy> proxy = GrSurfaceProxy::MakeDeferred(context->resourceProvider(), - desc, SkBudgeted::kYes, - bm.getPixels(), bm.rowBytes()); + sk_sp<GrTextureProxy> proxy = GrSurfaceProxy::MakeDeferred( + context->contextPriv().proxyProvider(), + desc, SkBudgeted::kYes, + bm.getPixels(), bm.rowBytes()); if (!proxy) { return nullptr; } diff --git a/gm/texdata.cpp b/gm/texdata.cpp index 4b63e2ea69..4e44bccbdf 100644 --- a/gm/texdata.cpp +++ b/gm/texdata.cpp @@ -91,9 +91,10 @@ DEF_SIMPLE_GM_BG(texdata, canvas, 2 * S, 2 * S, SK_ColorBLACK) { desc.fHeight = 2 * S; desc.fConfig = SkImageInfo2GrPixelConfig(ii, *context->caps()); - sk_sp<GrTextureProxy> proxy = GrSurfaceProxy::MakeDeferred(context->resourceProvider(), - desc, SkBudgeted::kNo, - gTextureData.get(), 0); + sk_sp<GrTextureProxy> proxy = GrSurfaceProxy::MakeDeferred( + context->contextPriv().proxyProvider(), + desc, SkBudgeted::kNo, + gTextureData.get(), 0); if (!proxy) { return; } diff --git a/gm/texturedomaineffect.cpp b/gm/texturedomaineffect.cpp index 3dd0847912..7ee28b1ffb 100644 --- a/gm/texturedomaineffect.cpp +++ b/gm/texturedomaineffect.cpp @@ -12,6 +12,7 @@ #if SK_SUPPORT_GPU #include "GrContext.h" +#include "GrContextPriv.h" #include "GrRenderTargetContextPriv.h" #include "SkBitmap.h" #include "SkGr.h" @@ -91,10 +92,11 @@ protected: desc.fHeight = fBmp.height(); desc.fConfig = SkImageInfo2GrPixelConfig(fBmp.info(), *context->caps()); - sk_sp<GrTextureProxy> proxy(GrSurfaceProxy::MakeDeferred(context->resourceProvider(), - desc, SkBudgeted::kYes, - fBmp.getPixels(), - fBmp.rowBytes())); + sk_sp<GrTextureProxy> proxy(GrSurfaceProxy::MakeDeferred( + context->contextPriv().proxyProvider(), + desc, SkBudgeted::kYes, + fBmp.getPixels(), + fBmp.rowBytes())); if (!proxy) { return; } diff --git a/gm/yuvtorgbeffect.cpp b/gm/yuvtorgbeffect.cpp index f5a905c03f..ba27719e3b 100644 --- a/gm/yuvtorgbeffect.cpp +++ b/gm/yuvtorgbeffect.cpp @@ -12,6 +12,7 @@ #if SK_SUPPORT_GPU #include "GrContext.h" +#include "GrContextPriv.h" #include "GrRenderTargetContextPriv.h" #include "GrTextureProxy.h" #include "SkBitmap.h" @@ -92,7 +93,7 @@ protected: desc.fHeight = fBmp[i].height(); desc.fConfig = SkImageInfo2GrPixelConfig(fBmp[i].info(), *context->caps()); - proxy[i] = GrSurfaceProxy::MakeDeferred(context->resourceProvider(), + proxy[i] = GrSurfaceProxy::MakeDeferred(context->contextPriv().proxyProvider(), desc, SkBudgeted::kYes, fBmp[i].getPixels(), fBmp[i].rowBytes()); if (!proxy[i]) { @@ -222,7 +223,7 @@ protected: desc.fHeight = fBmp[index].height(); desc.fConfig = SkImageInfo2GrPixelConfig(fBmp[index].info(), *context->caps()); - proxy[i] = GrSurfaceProxy::MakeDeferred(context->resourceProvider(), + proxy[i] = GrSurfaceProxy::MakeDeferred(context->contextPriv().proxyProvider(), desc, SkBudgeted::kYes, fBmp[index].getPixels(), fBmp[index].rowBytes()); |