diff options
| author |  bsalomon <bsalomon@google.com> | 2016-02-25 06:52:12 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-02-25 06:52:12 -0800 |
| commit | bd500f09ce5b1ca464431d693f9ec5da60a59230 (patch) | |
| tree | 16d46d581f91f0ebbb9fbf2316be2be7fac32ad8 /src/core | |
| parent | 2d07b76405a672dced858aaa9ed475755ea13305 (diff) | |
Revert of Move Budgeted enum out of SkSurface, use in GrTextureProvider (patchset #6 id:100001 of https://codereview.chromium.org/1728093005/ )
Reason for revert:
Need workaround for chrome to build
Original issue's description:
> Move Budgeted enum out of SkSurface, use in GrTextureProvider
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1728093005
> DOCS_PREVIEW= https://skia.org/?cl=1728093005
>
> Committed: https://skia.googlesource.com/skia/+/57599fe6c0336feaeeeb9b1996e77b70219b483c
TBR=reed@google.com
# 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/1734043002
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/SkCanvas.cpp | 3 | ||||
| -rw-r--r-- | src/core/SkImageCacherator.cpp | 2 | ||||
| -rw-r--r-- | src/core/SkPictureImageGenerator.cpp | 3 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index a628105001..f0476cd183 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -1146,8 +1146,7 @@ static void draw_filter_into_device(SkBaseDevice* src, const SkImageFilter* filt // TODO: we should actually only copy the portion of the source needed to apply the image // filter GrContext* context = srcRT->getContext(); - SkAutoTUnref<GrTexture> tex(context->textureProvider()->createTexture(srcRT->desc(), - SkBudgeted::kYes)); + SkAutoTUnref<GrTexture> tex(context->textureProvider()->createTexture(srcRT->desc(), true)); context->copySurface(tex, srcRT); diff --git a/src/core/SkImageCacherator.cpp b/src/core/SkImageCacherator.cpp index 155eb82242..dc831d7cbf 100644 --- a/src/core/SkImageCacherator.cpp +++ b/src/core/SkImageCacherator.cpp @@ -203,7 +203,7 @@ static GrTexture* load_compressed_into_texture(GrContext* ctx, SkData* data, GrS } desc.fConfig = config; - return ctx->textureProvider()->createTexture(desc, SkBudgeted::kYes, rawStart, 0); + return ctx->textureProvider()->createTexture(desc, true, rawStart, 0); } class Generator_GrYUVProvider : public GrYUVProvider { diff --git a/src/core/SkPictureImageGenerator.cpp b/src/core/SkPictureImageGenerator.cpp index db192a36e2..398c6eb5df 100644 --- a/src/core/SkPictureImageGenerator.cpp +++ b/src/core/SkPictureImageGenerator.cpp @@ -138,7 +138,8 @@ GrTexture* SkPictureImageGenerator::onGenerateTexture(GrContext* ctx, const SkIR // // TODO: respect the usage, by possibly creating a different (pow2) surface // - SkAutoTUnref<SkSurface> surface(SkSurface::NewRenderTarget(ctx, SkBudgeted::kYes, + SkAutoTUnref<SkSurface> surface(SkSurface::NewRenderTarget(ctx, + SkSurface::kYes_Budgeted, surfaceInfo)); if (!surface.get()) { return nullptr; |