diff options
| author |  Brian Salomon <bsalomon@google.com> | 2018-02-01 12:54:30 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-02-01 18:16:58 +0000 |
| commit | 48825b11ad25c98b9a4884d5cc0edd4e290c4409 (patch) | |
| tree | 4278b01107ad8da03453c879ee50ce1a471d2ee2 /src/image/SkSurface.cpp | |
| parent | f8393c861975350c4ca9d4f6c95b186c081dbbcf (diff) | |
Redefine the meaning of sample counts in GPU backend.
Old: 0 -> nonMSAA
1+ -> MSAA
New:
0 -> error/unsupported
1 -> nonMSAA
2+ -> MSAA
We still allow 0 to mean nonMSAA in three sets of public APIs for backwards compatibility:
1) SkSurface factories
2) GrBackendRenderTarget constructors
3) GrCaps::getSampleCnt()'s requestedCount parameter
However, we immediately clamp to 1 and treat 0 as invalid/non-renderable internally.
This also changes the behavior when using a large sample count. We now fail in that case rather than using the largest sample available sample count. GrCaps::getSampleCount() will return 0 in this case.
Bug: skia:
Change-Id: Ida22c6b22c1365e563c9046b611e88bf5eb3ff33
Reviewed-on: https://skia-review.googlesource.com/101560
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/image/SkSurface.cpp')
| -rw-r--r-- | src/image/SkSurface.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/image/SkSurface.cpp b/src/image/SkSurface.cpp index 0a684cce60..ef6d809957 100644 --- a/src/image/SkSurface.cpp +++ b/src/image/SkSurface.cpp @@ -247,8 +247,8 @@ sk_sp<SkSurface> SkSurface::MakeNull(int width, int height) { #if !SK_SUPPORT_GPU -sk_sp<SkSurface> SkSurface::MakeRenderTarget(GrContext*, SkBudgeted, const SkImageInfo&, - int, GrSurfaceOrigin, const SkSurfaceProps*, bool) { +sk_sp<SkSurface> SkSurface::MakeRenderTarget(GrContext*, SkBudgeted, const SkImageInfo&, int, + GrSurfaceOrigin, const SkSurfaceProps*, bool) { return nullptr; } |