aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests/DeviceTest.cpp
diff options
context:
space:
mode:
authorGravatar Brian Salomon <bsalomon@google.com>2018-02-01 12:54:30 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-02-01 18:16:58 +0000
commit48825b11ad25c98b9a4884d5cc0edd4e290c4409 (patch)
tree4278b01107ad8da03453c879ee50ce1a471d2ee2 /tests/DeviceTest.cpp
parentf8393c861975350c4ca9d4f6c95b186c081dbbcf (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 'tests/DeviceTest.cpp')
-rw-r--r--tests/DeviceTest.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/DeviceTest.cpp b/tests/DeviceTest.cpp
index 64b83fcb3c..58369cc149 100644
--- a/tests/DeviceTest.cpp
+++ b/tests/DeviceTest.cpp
@@ -81,7 +81,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SpecialImage_GPUDevice, reporter, ctxInfo) {
SkImageInfo ii = SkImageInfo::MakeN32Premul(2*kWidth, 2*kHeight);
sk_sp<SkBaseDevice> gpuDev(SkGpuDevice::Make(context, SkBudgeted::kNo, ii,
- 0, kBottomLeft_GrSurfaceOrigin, nullptr,
+ 1, kBottomLeft_GrSurfaceOrigin, nullptr,
GrMipMapped::kNo,
SkGpuDevice::kClear_InitContents));