| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright 2015 Google Inc. | 2  * Copyright 2015 Google Inc. | 
| 3  * | 3  * | 
| 4  * Use of this source code is governed by a BSD-style license that can be | 4  * Use of this source code is governed by a BSD-style license that can be | 
| 5  * found in the LICENSE file. | 5  * found in the LICENSE file. | 
| 6  */ | 6  */ | 
| 7 | 7 | 
| 8 #include "GrPipeline.h" | 8 #include "GrPipeline.h" | 
| 9 | 9 | 
| 10 #include "GrCaps.h" | 10 #include "GrCaps.h" | 
| 11 #include "GrBatch.h" | 11 #include "GrBatch.h" | 
| 12 #include "GrGpu.h" | 12 #include "GrGpu.h" | 
| 13 #include "GrPipelineBuilder.h" | 13 #include "GrPipelineBuilder.h" | 
| 14 #include "GrProcOptInfo.h" | 14 #include "GrProcOptInfo.h" | 
| 15 #include "GrXferProcessor.h" | 15 #include "GrXferProcessor.h" | 
| 16 | 16 | 
| 17 GrPipeline::GrPipeline(const GrPipelineBuilder& pipelineBuilder, | 17 GrPipeline::GrPipeline(const GrPipelineBuilder& pipelineBuilder, | 
| 18                        const GrProcOptInfo& colorPOI, | 18                        const GrProcOptInfo& colorPOI, | 
| 19                        const GrProcOptInfo& coveragePOI, | 19                        const GrProcOptInfo& coveragePOI, | 
| 20                        const GrCaps& caps, | 20                        const GrCaps& caps, | 
| 21                        const GrScissorState& scissorState, | 21                        const GrScissorState& scissorState, | 
| 22                        const GrXferProcessor::DstTexture* dstTexture) { | 22                        const GrXferProcessor::DstTexture* dstTexture) { | 
| 23     // Create XferProcessor from DS's XPFactory | 23     // Create XferProcessor from DS's XPFactory | 
| 24     SkAutoTUnref<GrXferProcessor> xferProcessor( | 24     SkAutoTUnref<GrXferProcessor> xferProcessor( | 
| 25         pipelineBuilder.getXPFactory()->createXferProcessor( | 25         pipelineBuilder.getXPFactory()->createXferProcessor( | 
| 26             colorPOI, coveragePOI, dstTexture, caps)); | 26             colorPOI, coveragePOI, pipelineBuilder.hasMixedSamples(), dstTexture
     , caps)); | 
| 27 | 27 | 
| 28     GrColor overrideColor = GrColor_ILLEGAL; | 28     GrColor overrideColor = GrColor_ILLEGAL; | 
| 29     if (colorPOI.firstEffectiveStageIndex() != 0) { | 29     if (colorPOI.firstEffectiveStageIndex() != 0) { | 
| 30         overrideColor = colorPOI.inputColorToEffectiveStage(); | 30         overrideColor = colorPOI.inputColorToEffectiveStage(); | 
| 31     } | 31     } | 
| 32 | 32 | 
| 33     GrXferProcessor::OptFlags optFlags; | 33     GrXferProcessor::OptFlags optFlags; | 
| 34     if (xferProcessor) { | 34     if (xferProcessor) { | 
| 35         fXferProcessor.reset(xferProcessor.get()); | 35         fXferProcessor.reset(xferProcessor.get()); | 
| 36 | 36 | 
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 154     SkASSERT(this->numFragmentStages() == that.numFragmentStages()); | 154     SkASSERT(this->numFragmentStages() == that.numFragmentStages()); | 
| 155     for (int i = 0; i < this->numFragmentStages(); i++) { | 155     for (int i = 0; i < this->numFragmentStages(); i++) { | 
| 156 | 156 | 
| 157         if (this->getFragmentStage(i) != that.getFragmentStage(i)) { | 157         if (this->getFragmentStage(i) != that.getFragmentStage(i)) { | 
| 158             return false; | 158             return false; | 
| 159         } | 159         } | 
| 160     } | 160     } | 
| 161     return true; | 161     return true; | 
| 162 } | 162 } | 
| 163 | 163 | 
| OLD | NEW | 
|---|