From c633abbb342e3af0e56382e8cb7e7d9fed71e237 Mon Sep 17 00:00:00 2001 From: csmartdalton Date: Tue, 1 Nov 2016 08:55:55 -0700 Subject: Remove GrStencilSettings from GrPipeline Updates the GrPipeline to have user stencil settings instead of actual settings. This allows us to further defer creating and attaching a stencil buffer. This change is a partial step. The ultimate goal is to attach the stencil buffer and create the stencil settings during render target flush, but for the sake of keeping this CL smaller, we create the stencil settings right before use for now. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2468653002 Review-Url: https://codereview.chromium.org/2468653002 --- src/gpu/instanced/InstanceProcessor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/gpu/instanced/InstanceProcessor.cpp') diff --git a/src/gpu/instanced/InstanceProcessor.cpp b/src/gpu/instanced/InstanceProcessor.cpp index 55be89ebb6..475b020b6d 100644 --- a/src/gpu/instanced/InstanceProcessor.cpp +++ b/src/gpu/instanced/InstanceProcessor.cpp @@ -1701,7 +1701,7 @@ GLSLInstanceProcessor::Backend::Create(const GrPipeline& pipeline, BatchInfo bat case AntialiasMode::kMSAA: case AntialiasMode::kMixedSamples: { const GrRenderTargetPriv& rtp = pipeline.getRenderTarget()->renderTargetPriv(); - const GrGpu::MultisampleSpecs& specs = rtp.getMultisampleSpecs(pipeline.getStencil()); + const GrGpu::MultisampleSpecs& specs = rtp.getMultisampleSpecs(pipeline); return new BackendMultisample(batchInfo, inputs, specs.fEffectiveSampleCnt); } } -- cgit v1.2.3