From d0d7270fcc32546005b8e847df516cb11592cd30 Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Thu, 1 Feb 2018 14:16:02 -0500 Subject: Revert "Revert "Redefine the meaning of sample counts in GPU backend."" Fixes gpu config default samples to be 1 and updates config parsing test accordingly. This reverts commit c1ce2f7966babaae0deb150f93f1227ee5af9285. Bug: skia: Change-Id: I456973b1f52ced85a2011ea10fc49449bfc5846f Reviewed-on: https://skia-review.googlesource.com/102147 Reviewed-by: Brian Salomon Commit-Queue: Brian Salomon --- tests/DeferredDisplayListTest.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'tests/DeferredDisplayListTest.cpp') diff --git a/tests/DeferredDisplayListTest.cpp b/tests/DeferredDisplayListTest.cpp index 049b97154c..9938d498ce 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; } @@ -141,7 +140,7 @@ DEF_GPUTEST_FOR_ALL_CONTEXTS(SkSurfaceCharacterization, reporter, ctxInfo) { int supportedSampleCount = context->caps()->getSampleCount( 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