diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-07-21 14:17:45 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-21 14:17:54 +0000 |
| commit | 96be9df1300b2281641b038ef11064157f6e0b41 (patch) | |
| tree | 2d7c80612daa3fd76114fe158fe2857cce9b2cb0 /tests/SurfaceTest.cpp | |
| parent | 7877d3237826fc4985af3e9d540cff79e408ef34 (diff) | |
Revert "Reduce dependence on GrSurface's origin field"
This reverts commit 467022b1861033d968195687da15270c208279ff.
Reason for revert: GrAHardwareBufferImageGenerator.cpp
Original change's description:
> Reduce dependence on GrSurface's origin field
>
> Unfortunately, GrGPU and its ilk are still using the GrSurface's origin a lot. I will clean that up in a second CL.
>
> Change-Id: Iba729440ce8ea8d24bb7f4e5de55ed576a0f176d
> Reviewed-on: https://skia-review.googlesource.com/24700
> Commit-Queue: Robert Phillips <robertphillips@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
TBR=bsalomon@google.com,robertphillips@google.com
Change-Id: I1b3f5c3b82d250ac164beb1d5c83abb6c3c6ab3b
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/25620
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'tests/SurfaceTest.cpp')
| -rw-r--r-- | tests/SurfaceTest.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/SurfaceTest.cpp b/tests/SurfaceTest.cpp index 797750f3b1..5249b3d562 100644 --- a/tests/SurfaceTest.cpp +++ b/tests/SurfaceTest.cpp @@ -599,7 +599,7 @@ static sk_sp<SkSurface> create_gpu_surface_backend_texture( backendHandle); sk_sp<SkSurface> surface = SkSurface::MakeFromBackendTexture(context, backendTex, - kTopLeft_GrSurfaceOrigin, sampleCnt, + kDefault_GrSurfaceOrigin, sampleCnt, nullptr, nullptr); if (!surface) { context->getGpu()->deleteTestingOnlyBackendTexture(backendHandle); @@ -625,7 +625,7 @@ static sk_sp<SkSurface> create_gpu_surface_backend_texture_as_render_target( kRGBA_8888_GrPixelConfig, backendHandle); sk_sp<SkSurface> surface = SkSurface::MakeFromBackendTextureAsRenderTarget( - context, backendTex, kTopLeft_GrSurfaceOrigin, sampleCnt, nullptr, nullptr); + context, backendTex, kDefault_GrSurfaceOrigin, sampleCnt, nullptr, nullptr); if (!surface) { context->getGpu()->deleteTestingOnlyBackendTexture(backendHandle); @@ -907,7 +907,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SurfaceCreationWithColorSpace_Gpu, reporter, backendHandle); return SkSurface::MakeFromBackendTexture(context, backendTex, - kTopLeft_GrSurfaceOrigin, 0, + kDefault_GrSurfaceOrigin, 0, sk_ref_sp(info.colorSpace()), nullptr); }; |