From d0e36a92de398843cafc3aebef39c863b29c23de Mon Sep 17 00:00:00 2001 From: robertphillips Date: Tue, 10 May 2016 10:23:30 -0700 Subject: Fix AllocedProxyTest on Mesa Mesa is handing us a context that supports MSAA but has 0 as the max number of color samples GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1967503004 Review-Url: https://codereview.chromium.org/1967503004 --- tests/ProxyTest.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/ProxyTest.cpp b/tests/ProxyTest.cpp index 68fc1f142e..e1e5aeb2cf 100644 --- a/tests/ProxyTest.cpp +++ b/tests/ProxyTest.cpp @@ -85,7 +85,8 @@ DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(AllocedProxyTest, reporter, ctxInfo) { for (auto budgeted : { SkBudgeted::kYes, SkBudgeted::kNo }) { for (auto numSamples : { 0, 4}) { bool renderable = ctxInfo.fGrContext->caps()->isConfigRenderable( - config, numSamples > 0); + config, numSamples > 0) && + numSamples <= ctxInfo.fGrContext->caps()->maxColorSampleCount(); GrSurfaceDesc desc; desc.fOrigin = origin; -- cgit v1.2.3