Differentiate maxColorSamples and maxStencilSamples in GrCaps

src/gpu/GrContext.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrContext.h"
 #include "GrContextOptions.h"
@@ skipping 554 matching lines @@
         return 0;
     }
     int chosenSampleCount = 0;
     if (fGpu->caps()->shaderCaps()->pathRenderingSupport()) {
         if (dpi >= 250.0f) {
             chosenSampleCount = 4;
         } else {
             chosenSampleCount = 16;
         }
     }
-    return chosenSampleCount <= fGpu->caps()->maxSampleCount() ?
-        chosenSampleCount : 0;
+    bool validSampleCount = chosenSampleCount <= fGpu->caps()->maxColorSampleCount() &&

[bsalomon, 2016/01/15 18:08:29]

Might need a check for mixed samples support here. If we're using it I think we
only care about stencil count

+                            chosenSampleCount <= fGpu->caps()->maxStencilSampleCount();
+    return validSampleCount ? chosenSampleCount : 0;
 }
 
 
 GrDrawContext* GrContext::drawContext(GrRenderTarget* rt, const SkSurfaceProps* surfaceProps) {
     ASSERT_SINGLE_OWNER
     return fDrawingManager->drawContext(rt, surfaceProps);
 }
 
 bool GrContext::abandoned() const {
     ASSERT_SINGLE_OWNER
@@ skipping 75 matching lines @@
     ASSERT_SINGLE_OWNER
     fResourceCache->setLimits(maxTextures, maxTextureBytes);
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
 void GrContext::dumpMemoryStatistics(SkTraceMemoryDump* traceMemoryDump) const {
     ASSERT_SINGLE_OWNER
     fResourceCache->dumpMemoryStatistics(traceMemoryDump);
 }