From 5bb82cbecd740d21b92e8d2944280ab6eb6af7a6 Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Fri, 2 Feb 2018 13:51:50 -0500 Subject: Revert "Revert "Revert "Revert "Redefine the meaning of sample counts in GPU backend."""" This reverts commit 18c52a7b52211de5d0dcd86dc048adef758c6c75. Also relands "More sample count cleanup:" and "Add new GrContext queries for imagability, surfacability, and max sample count of color types" Bug: skia: Change-Id: I4028105a3a1f16ce3944e134619eb6245af6b947 Reviewed-on: https://skia-review.googlesource.com/102940 Reviewed-by: Brian Salomon Commit-Queue: Brian Salomon --- tests/GLProgramsTest.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'tests/GLProgramsTest.cpp') diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp index 6c2e8d2f04..f625a771bf 100644 --- a/tests/GLProgramsTest.cpp +++ b/tests/GLProgramsTest.cpp @@ -150,7 +150,10 @@ static sk_sp random_render_target_context(GrContext* cont const GrCaps* caps) { GrSurfaceOrigin origin = random->nextBool() ? kTopLeft_GrSurfaceOrigin : kBottomLeft_GrSurfaceOrigin; - int sampleCnt = random->nextBool() ? caps->getSampleCount(4, kRGBA_8888_GrPixelConfig) : 0; + int sampleCnt = + random->nextBool() ? caps->getRenderTargetSampleCount(2, kRGBA_8888_GrPixelConfig) : 1; + // Above could be 0 if msaa isn't supported. + sampleCnt = SkTMax(1, sampleCnt); sk_sp renderTargetContext(context->makeDeferredRenderTargetContext( SkBackingFit::kExact, -- cgit v1.2.3