From d653cac70ed17983125ceed053138c09f1401846 Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Thu, 1 Feb 2018 13:58:00 -0500 Subject: More sample count cleanup: rename getSampleCount -> getRenderTargetSampleCount because it will return 0 when a config is not renderable but *is* supported as a texture format. (Old name kept around until Chrome stops calling it) Add virtual GrCaps::maxRenderTargetSampleCount(GrPixelConfig). Devirtualize isConfigRenderable() and implement as maxRTSC != 0. Separate implementation for version with bool withMSAA param to be removed after Flutter is updated to no longer call. Consolidate various file static GrSurfaceDesc validators fns into GrCaps::validateSurfaceDesc(). Bug: skia: Change-Id: Ie30a291aa027e910df3bd90fac8518ccdb39e53f Reviewed-on: https://skia-review.googlesource.com/102141 Commit-Queue: Brian Salomon Reviewed-by: Greg Daniel --- tests/GrSurfaceTest.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'tests/GrSurfaceTest.cpp') diff --git a/tests/GrSurfaceTest.cpp b/tests/GrSurfaceTest.cpp index 29f4f25695..32ac0c71e6 100644 --- a/tests/GrSurfaceTest.cpp +++ b/tests/GrSurfaceTest.cpp @@ -143,17 +143,17 @@ DEF_GPUTEST_FOR_ALL_CONTEXTS(GrSurfaceRenderability, reporter, ctxInfo) { desc.fFlags = kRenderTarget_GrSurfaceFlag; tex = resourceProvider->createTexture(desc, SkBudgeted::kNo); - bool icr = caps->isConfigRenderable(config, false); - REPORTER_ASSERT(reporter, SkToBool(tex) == icr, - "config:%d, tex:%d, isConfigRenderable(false):%d", config, - SkToBool(tex), icr); + bool isRenderable = caps->isConfigRenderable(config); + REPORTER_ASSERT(reporter, SkToBool(tex) == isRenderable, + "config:%d, tex:%d, isRenderable:%d", config, SkToBool(tex), + isRenderable); desc.fSampleCnt = 2; tex = resourceProvider->createTexture(desc, SkBudgeted::kNo); - icr = caps->isConfigRenderable(config, true); - REPORTER_ASSERT(reporter, SkToBool(tex) == icr, - "config:%d, tex:%d, isConfigRenderable(true):%d", config, SkToBool(tex), - icr); + isRenderable = SkToBool(caps->getRenderTargetSampleCount(2, config)); + REPORTER_ASSERT(reporter, SkToBool(tex) == isRenderable, + "config:%d, tex:%d, isRenderable:%d", config, SkToBool(tex), + isRenderable); } } } @@ -178,7 +178,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(InitialTextureClear, reporter, context_info) } desc.fFlags = kPerformInitialClear_GrSurfaceFlag; for (bool rt : {false, true}) { - if (rt && !context->caps()->isConfigRenderable(desc.fConfig, false)) { + if (rt && !context->caps()->isConfigRenderable(desc.fConfig)) { continue; } desc.fFlags |= rt ? kRenderTarget_GrSurfaceFlag : kNone_GrSurfaceFlags; -- cgit v1.2.3