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 --- bench/nanobench.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'bench/nanobench.cpp') diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp index b9ecfa7b51..f7f0bff82b 100644 --- a/bench/nanobench.cpp +++ b/bench/nanobench.cpp @@ -428,7 +428,8 @@ static void create_config(const SkCommandLineConfig* config, SkTArray* c if (const GrContext* ctx = factory.get(ctxType, ctxOverrides)) { GrPixelConfig grPixConfig = SkImageInfo2GrPixelConfig(colorType, colorSpace, *ctx->caps()); - int supportedSampleCount = ctx->caps()->getSampleCount(sampleCount, grPixConfig); + int supportedSampleCount = + ctx->caps()->getRenderTargetSampleCount(sampleCount, grPixConfig); if (sampleCount != supportedSampleCount) { SkDebugf("Configuration '%s' sample count %d is not a supported sample count.\n", config->getTag().c_str(), sampleCount); -- cgit v1.2.3