From bdecacfbe47bc7211336bb847bb33c00ef85ea3e Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Fri, 2 Feb 2018 20:32:49 -0500 Subject: Revert "Revert "Revert "Revert "Revert "Revert "Redefine the meaning of sample counts in GPU backend."""""" This reverts commit 3a2cc2c2ec124de36d2544b2a523ef1dd317ca32. Fix code with samplecnt=0 that slipped in between trybots/CQ and landing of previous version Change-Id: Iab19f2e8d1e9901601c8c76244d7a88c5d707fab Reviewed-on: https://skia-review.googlesource.com/103181 Reviewed-by: Brian Salomon Commit-Queue: Brian Salomon --- tests/DeferredDisplayListTest.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'tests/DeferredDisplayListTest.cpp') diff --git a/tests/DeferredDisplayListTest.cpp b/tests/DeferredDisplayListTest.cpp index 049b97154c..b3637cbfa3 100644 --- a/tests/DeferredDisplayListTest.cpp +++ b/tests/DeferredDisplayListTest.cpp @@ -31,9 +31,8 @@ public: , fOrigin(kTopLeft_GrSurfaceOrigin) , fColorType(kRGBA_8888_SkColorType) , fColorSpace(SkColorSpace::MakeSRGB()) - , fSampleCount(0) - , fSurfaceProps(0x0, kUnknown_SkPixelGeometry) { - } + , fSampleCount(1) + , fSurfaceProps(0x0, kUnknown_SkPixelGeometry) {} int sampleCount() const { return fSampleCount; } @@ -138,10 +137,10 @@ DEF_GPUTEST_FOR_ALL_CONTEXTS(SkSurfaceCharacterization, reporter, ctxInfo) { if (SurfaceParameters::kSampleCount == i) { SkSurface_Gpu* gpuSurf = static_cast(s.get()); - int supportedSampleCount = context->caps()->getSampleCount( + int supportedSampleCount = context->caps()->getRenderTargetSampleCount( params.sampleCount(), gpuSurf->getDevice()->accessRenderTargetContext()->asRenderTargetProxy()->config()); - if (0 == supportedSampleCount) { + if (1 == supportedSampleCount) { // If changing the sample count won't result in a different // surface characterization, skip this step continue; -- cgit v1.2.3