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 --- tools/skpbench/skpbench.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tools/skpbench') diff --git a/tools/skpbench/skpbench.cpp b/tools/skpbench/skpbench.cpp index fcab2d3af8..6b89bc27ff 100644 --- a/tools/skpbench/skpbench.cpp +++ b/tools/skpbench/skpbench.cpp @@ -292,7 +292,8 @@ int main(int argc, char** argv) { GrPixelConfig grPixConfig = SkImageInfo2GrPixelConfig(config->getColorType(), config->getColorSpace(), *ctx->caps()); - int supportedSampleCount = ctx->caps()->getSampleCount(config->getSamples(), grPixConfig); + int supportedSampleCount = + ctx->caps()->getRenderTargetSampleCount(config->getSamples(), grPixConfig); if (supportedSampleCount != config->getSamples()) { exitf(ExitErr::kUnavailable, "sample count %i not supported by platform", config->getSamples()); -- cgit v1.2.3