Implement support for mixed sampled render targets

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"
 
@@ skipping 200 matching lines @@
     }
     if (resourceBytes) {
         *resourceBytes = fResourceCache->getBudgetedResourceBytes();
     }
 }
 
 GrTextContext* GrContext::createTextContext(GrRenderTarget* renderTarget,
                                             const SkDeviceProperties&
                                             leakyProperties,
                                             bool enableDistanceFieldFonts) {
-    if (fGpu->caps()->pathRenderingSupport() && renderTarget->isMultisampled()) {
+    if (fGpu->caps()->pathRenderingSupport() &&
+        renderTarget->isMultisampled(GrRenderTarget::kAnywhere_PipelineStage)) {

[Chris Dalton, 2015/03/20 07:01:45]

The nvpr requirement is for a mulitsample stencil buffer, so we should check
kStencilBuffer_PipelineStage here.

         GrStencilBuffer* sb = renderTarget->renderTargetPriv().attachStencilBuffer();
         if (sb) {
             return GrStencilAndCoverTextContext::Create(this, leakyProperties);
         }
     } 
 
     return GrDistanceFieldTextContext::Create(this, leakyProperties, enableDistanceFieldFonts);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 1765 matching lines @@
     }
 }
 
 void GrContext::removeGpuTraceMarker(const GrGpuTraceMarker* marker) {
     fGpu->removeGpuTraceMarker(marker);
     if (fDrawBuffer) {
         fDrawBuffer->removeGpuTraceMarker(marker);
     }
 }