diff options
author | 2014-12-10 13:48:57 -0800 | |
---|---|---|
committer | 2014-12-10 13:48:57 -0800 | |
commit | c6bc58eded89b0c0a36b8e20e193c200f297a0da (patch) | |
tree | 3de559baf8eecee6f6576c9b6deee39fb8258775 /src/gpu/GrOptDrawState.cpp | |
parent | 04b49c31789201fbef969f5598a286187920dd56 (diff) |
Remove GP from drawstate, revision of invariant output for GP
BUG=skia:
Review URL: https://codereview.chromium.org/791743003
Diffstat (limited to 'src/gpu/GrOptDrawState.cpp')
-rw-r--r-- | src/gpu/GrOptDrawState.cpp | 45 |
1 files changed, 25 insertions, 20 deletions
diff --git a/src/gpu/GrOptDrawState.cpp b/src/gpu/GrOptDrawState.cpp index 9ebe551d6b..010fe4b739 100644 --- a/src/gpu/GrOptDrawState.cpp +++ b/src/gpu/GrOptDrawState.cpp @@ -14,21 +14,36 @@ #include "GrXferProcessor.h" GrOptDrawState::GrOptDrawState(const GrDrawState& drawState, - GrColor color, - uint8_t coverage, + const GrGeometryProcessor* gp, + const GrPathProcessor* pathProc, const GrDrawTargetCaps& caps, const ScissorState& scissorState, const GrDeviceCoordTexture* dstCopy, GrGpu::DrawType drawType) : fFinalized(false) { - GrColor coverageColor = GrColorPackRGBA(coverage, coverage, coverage, coverage); fDrawType = drawType; - const GrProcOptInfo& colorPOI = drawState.colorProcInfo(color); - const GrProcOptInfo& coveragePOI = drawState.coverageProcInfo(coverageColor); + // Copy GeometryProcesssor from DS or ODS + if (gp) { + SkASSERT(!pathProc); + SkASSERT(!(GrGpu::IsPathRenderingDrawType(drawType) || + GrGpu::kStencilPath_DrawType == drawType)); + fGeometryProcessor.reset(gp); + fPrimitiveProcessor.reset(gp); + } else { + SkASSERT(!gp && pathProc && (GrGpu::IsPathRenderingDrawType(drawType) || + GrGpu::kStencilPath_DrawType == drawType)); + fPrimitiveProcessor.reset(pathProc); + } + + + const GrProcOptInfo& colorPOI = drawState.colorProcInfo(fPrimitiveProcessor); + const GrProcOptInfo& coveragePOI = drawState.coverageProcInfo(fPrimitiveProcessor); fColor = colorPOI.inputColorToEffectiveStage(); - fCoverage = coverage; + // TODO fix this when coverage stages work correctly + // fCoverage = coveragePOI.inputColorToEffectiveStage(); + fCoverage = fPrimitiveProcessor->coverage(); // Create XferProcessor from DS's XPFactory SkAutoTUnref<GrXferProcessor> xferProcessor( @@ -86,14 +101,11 @@ GrOptDrawState::GrOptDrawState(const GrDrawState& drawState, fFlags |= kDither_Flag; } - fDescInfo.fHasVertexColor = drawState.hasGeometryProcessor() && - drawState.getGeometryProcessor()->hasVertexColor(); + fDescInfo.fHasVertexColor = gp && gp->hasVertexColor(); - fDescInfo.fHasVertexCoverage = drawState.hasGeometryProcessor() && - drawState.getGeometryProcessor()->hasVertexCoverage(); + fDescInfo.fHasVertexCoverage = gp && gp->hasVertexCoverage(); - bool hasLocalCoords = drawState.hasGeometryProcessor() && - drawState.getGeometryProcessor()->hasLocalCoords(); + bool hasLocalCoords = gp && gp->hasLocalCoords(); int firstColorStageIdx = colorPOI.firstEffectiveStageIndex(); fDescInfo.fInputColorIsUsed = colorPOI.inputColorIsUsed(); @@ -106,7 +118,6 @@ GrOptDrawState::GrOptDrawState(const GrDrawState& drawState, int firstCoverageStageIdx = 0; fDescInfo.fInputCoverageIsUsed = true; - GrXferProcessor::BlendInfo blendInfo; fXferProcessor->getBlendInfo(&blendInfo); fSrcBlend = blendInfo.fSrcBlend; @@ -118,12 +129,6 @@ GrOptDrawState::GrOptDrawState(const GrDrawState& drawState, fDescInfo.fRequiresLocalCoordAttrib = hasLocalCoords; - // Copy GeometryProcesssor from DS or ODS - SkASSERT(GrGpu::IsPathRenderingDrawType(drawType) || - GrGpu::kStencilPath_DrawType || - drawState.hasGeometryProcessor()); - fGeometryProcessor.reset(drawState.getGeometryProcessor()); - // Copy Stages from DS to ODS for (int i = firstColorStageIdx; i < drawState.numColorStages(); ++i) { SkNEW_APPEND_TO_TARRAY(&fFragmentStages, @@ -139,7 +144,7 @@ GrOptDrawState::GrOptDrawState(const GrDrawState& drawState, } // let the GP init the batch tracker - if (drawState.hasGeometryProcessor()) { + if (gp) { GrGeometryProcessor::InitBT init; init.fOutputColor = fDescInfo.fInputColorIsUsed; init.fOutputCoverage = fDescInfo.fInputCoverageIsUsed; |