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 /tests/ImageNewShaderTest.cpp | |
| 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 'tests/ImageNewShaderTest.cpp')
| -rw-r--r-- | tests/ImageNewShaderTest.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/ImageNewShaderTest.cpp b/tests/ImageNewShaderTest.cpp index 7b7d80e477..2c25b90c69 100644 --- a/tests/ImageNewShaderTest.cpp +++ b/tests/ImageNewShaderTest.cpp @@ -116,9 +116,9 @@ void gpuToGpu(skiatest::Reporter* reporter, GrContext* context) { SkImageInfo info = SkImageInfo::MakeN32Premul(5, 5); SkAutoTUnref<SkSurface> sourceSurface( - SkSurface::NewRenderTarget(context, SkBudgeted::kNo, info)); + SkSurface::NewRenderTarget(context, SkSurface::kNo_Budgeted, info)); SkAutoTUnref<SkSurface> destinationSurface( - SkSurface::NewRenderTarget(context, SkBudgeted::kNo, info)); + SkSurface::NewRenderTarget(context, SkSurface::kNo_Budgeted, info)); runShaderTest(reporter, sourceSurface.get(), destinationSurface.get(), info); } @@ -127,7 +127,7 @@ void gpuToRaster(skiatest::Reporter* reporter, GrContext* context) { SkImageInfo info = SkImageInfo::MakeN32Premul(5, 5); SkAutoTUnref<SkSurface> sourceSurface(SkSurface::NewRenderTarget(context, - SkBudgeted::kNo, info)); + SkSurface::kNo_Budgeted, info)); SkAutoTUnref<SkSurface> destinationSurface(SkSurface::NewRaster(info)); runShaderTest(reporter, sourceSurface.get(), destinationSurface.get(), info); @@ -138,7 +138,7 @@ void rasterToGpu(skiatest::Reporter* reporter, GrContext* context) { SkAutoTUnref<SkSurface> sourceSurface(SkSurface::NewRaster(info)); SkAutoTUnref<SkSurface> destinationSurface(SkSurface::NewRenderTarget(context, - SkBudgeted::kNo, info)); + SkSurface::kNo_Budgeted, info)); runShaderTest(reporter, sourceSurface.get(), destinationSurface.get(), info); } |