From 48825b11ad25c98b9a4884d5cc0edd4e290c4409 Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Thu, 1 Feb 2018 12:54:30 -0500 Subject: 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 Commit-Queue: Brian Salomon --- dm/DMSrcSink.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dm/DMSrcSink.h') diff --git a/dm/DMSrcSink.h b/dm/DMSrcSink.h index db1e064d72..157a484d2b 100644 --- a/dm/DMSrcSink.h +++ b/dm/DMSrcSink.h @@ -350,7 +350,7 @@ public: bool serial() const override { return !fThreaded; } const char* fileExtension() const override { return "png"; } SinkFlags flags() const override { - SinkFlags::Multisampled ms = fSampleCount > 0 ? SinkFlags::kMultisampled + SinkFlags::Multisampled ms = fSampleCount > 1 ? SinkFlags::kMultisampled : SinkFlags::kNotMultisampled; return SinkFlags{ SinkFlags::kGPU, SinkFlags::kDirect, ms }; } -- cgit v1.2.3