First step to moving vertex attributes to the geometryProcessor

src/gpu/GrOptDrawState.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrOptDrawState.h"
 
-#include "GrDefaultGeoProcFactory.h"
 #include "GrDrawState.h"
 #include "GrDrawTargetCaps.h"
 #include "GrGpu.h"
 #include "GrProcOptInfo.h"
 
 GrOptDrawState::GrOptDrawState(const GrDrawState& drawState,
                                GrGpu* gpu,
                                const ScissorState& scissorState,
                                const GrDeviceCoordTexture* dstCopy,
                                GrGpu::DrawType drawType) {
 
     GrBlendCoeff optSrcCoeff;
     GrBlendCoeff optDstCoeff;
     GrDrawState::BlendOpt blendOpt = drawState.getBlendOpt(false, &optSrcCoeff, &optDstCoeff);
 
     // When path rendering the stencil settings are not always set on the draw state
     // so we must check the draw type. In cases where we will skip drawing we simply return a
     // null GrOptDrawState.
     if (GrDrawState::kSkipDraw_BlendOpt == blendOpt && GrGpu::kStencilPath_DrawType != drawType) {
         // Set the fields that don't default init and return. The lack of a render target will
         // indicate that this can be skipped.
         fFlags = 0;
-        fVAPtr = NULL;
-        fVACount = 0;
-        fVAStride = 0;
         fDrawFace = GrDrawState::kInvalid_DrawFace;
         fSrcBlend = kZero_GrBlendCoeff;
         fDstBlend = kZero_GrBlendCoeff;
         fBlendConstant = 0x0;
         fViewMatrix.reset();
         return;
     }
 
     fRenderTarget.reset(drawState.fRenderTarget.get());
     SkASSERT(fRenderTarget);
     fScissorState = scissorState;
     fViewMatrix = drawState.getViewMatrix();
     fBlendConstant = drawState.getBlendConstant();
-    fVAPtr = drawState.getVertexAttribs();
-    fVACount = drawState.getVertexAttribCount();
-    fVAStride = drawState.getVertexStride();
     fStencilSettings = drawState.getStencil();
     fDrawFace = drawState.getDrawFace();
     fSrcBlend = optSrcCoeff;
     fDstBlend = optDstCoeff;
 
     // TODO move this out of optDrawState
     if (dstCopy) {
         fDstCopy = *dstCopy;
     }
 
     GrProgramDesc::DescInfo descInfo;
 
     fFlags = 0;
     if (drawState.isHWAntialias()) {
         fFlags |= kHWAA_Flag;
     }
     if (drawState.isColorWriteDisabled()) {
         fFlags |= kDisableColorWrite_Flag;
     }
     if (drawState.isDither()) {
         fFlags |= kDither_Flag;
     }
 
-    memcpy(descInfo.fFixedFunctionVertexAttribIndices,
-           drawState.getFixedFunctionVertexAttribIndices(),
-           sizeof(descInfo.fFixedFunctionVertexAttribIndices));
+    descInfo.fHasVertexColor = drawState.hasGeometryProcessor() &&
+                               drawState.getGeometryProcessor()->hasVertexColor();
 
-    uint8_t fixedFunctionVAToRemove = 0;
+    descInfo.fHasVertexCoverage = drawState.hasGeometryProcessor() &&
+                                 drawState.getGeometryProcessor()->hasVertexCoverage();
+
+    bool hasLocalCoords = drawState.hasGeometryProcessor() &&
+                          drawState.getGeometryProcessor()->hasLocalCoords();
 
     const GrProcOptInfo& colorPOI = drawState.colorProcInfo();
     int firstColorStageIdx = colorPOI.firstEffectiveStageIndex();
     descInfo.fInputColorIsUsed = colorPOI.inputColorIsUsed();
     fColor = colorPOI.inputColorToEffectiveStage();
     if (colorPOI.removeVertexAttrib()) {
-        fixedFunctionVAToRemove |= 0x1 << kColor_GrVertexAttribBinding;
+        descInfo.fHasVertexColor = false;
     }
 
     // TODO: Once we can handle single or four channel input into coverage stages then we can use
     // drawState's coverageProcInfo (like color above) to set this initial information.
     int firstCoverageStageIdx = 0;
     descInfo.fInputCoverageIsUsed = true;
     fCoverage = drawState.getCoverage();
 
     this->adjustProgramForBlendOpt(drawState, blendOpt, &descInfo, &firstColorStageIdx,
-                                   &firstCoverageStageIdx, &fixedFunctionVAToRemove);
-    // Should not be setting any more FFVA to be removed at this point
-    if (0 != fixedFunctionVAToRemove) {
-        this->removeFixedFunctionVertexAttribs(fixedFunctionVAToRemove, &descInfo);
-    }
-    this->getStageStats(drawState, firstColorStageIdx, firstCoverageStageIdx, &descInfo);
+                                   &firstCoverageStageIdx);
+
+    this->getStageStats(drawState, firstColorStageIdx, firstCoverageStageIdx, hasLocalCoords,
+                        &descInfo);
 
     // 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
-    bool explicitLocalCoords = descInfo.hasLocalCoordAttribute();
-
     for (int i = firstColorStageIdx; i < drawState.numColorStages(); ++i) {
         SkNEW_APPEND_TO_TARRAY(&fFragmentStages,
                                GrPendingFragmentStage,
-                               (drawState.fColorStages[i], explicitLocalCoords));
+                               (drawState.fColorStages[i], hasLocalCoords));
     }
     fNumColorStages = fFragmentStages.count();
     for (int i = firstCoverageStageIdx; i < drawState.numCoverageStages(); ++i) {
         SkNEW_APPEND_TO_TARRAY(&fFragmentStages,
                                GrPendingFragmentStage,
-                               (drawState.fCoverageStages[i], explicitLocalCoords));
+                               (drawState.fCoverageStages[i], hasLocalCoords));
     }
 
     this->setOutputStateInfo(drawState, blendOpt, *gpu->caps(), &descInfo);
 
     // now create a key
     gpu->buildProgramDesc(*this, descInfo, drawType, &fDesc);
 };
 
 void GrOptDrawState::setOutputStateInfo(const GrDrawState& ds,
                                         GrDrawState::BlendOpt blendOpt,
@@ skipping 27 matching lines @@
                    kZero_GrBlendCoeff == fDstBlend) {
             descInfo->fPrimaryOutputType = GrProgramDesc::kCombineWithDst_PrimaryOutputType;
         }
     }
 }
 
 void GrOptDrawState::adjustProgramForBlendOpt(const GrDrawState& ds,
                                               GrDrawState::BlendOpt blendOpt,
                                               GrProgramDesc::DescInfo* descInfo,
                                               int* firstColorStageIdx,
-                                              int* firstCoverageStageIdx,
-                                              uint8_t* fixedFunctionVAToRemove) {
+                                              int* firstCoverageStageIdx) {
     switch (blendOpt) {
         case GrDrawState::kNone_BlendOpt:
         case GrDrawState::kSkipDraw_BlendOpt:
         case GrDrawState::kCoverageAsAlpha_BlendOpt:
             break;
         case GrDrawState::kEmitCoverage_BlendOpt:
             fColor = 0xffffffff;
             descInfo->fInputColorIsUsed = true;
             *firstColorStageIdx = ds.numColorStages();
-            *fixedFunctionVAToRemove |= 0x1 << kColor_GrVertexAttribBinding;
+            descInfo->fHasVertexColor = false;
             break;
         case GrDrawState::kEmitTransBlack_BlendOpt:
             fColor = 0;
             fCoverage = 0xff;
             descInfo->fInputColorIsUsed = true;
             descInfo->fInputCoverageIsUsed = true;
             *firstColorStageIdx = ds.numColorStages();
             *firstCoverageStageIdx = ds.numCoverageStages();
-            *fixedFunctionVAToRemove |= (0x1 << kColor_GrVertexAttribBinding |
-                                         0x1 << kCoverage_GrVertexAttribBinding);
+            descInfo->fHasVertexColor = false;
+            descInfo->fHasVertexCoverage = false;
             break;
     }
 }
 
-void GrOptDrawState::removeFixedFunctionVertexAttribs(uint8_t removeVAFlag,
-                                                      GrProgramDesc::DescInfo* descInfo) {
-    int numToRemove = 0;
-    uint8_t maskCheck = 0x1;
-    // Count the number of vertex attributes that we will actually remove
-    for (int i = 0; i < kGrFixedFunctionVertexAttribBindingCnt; ++i) {
-        if ((maskCheck & removeVAFlag) && -1 != descInfo->fFixedFunctionVertexAttribIndices[i]) {
-            ++numToRemove;
-        }
-        maskCheck <<= 1;
-    }
-
-    fOptVA.reset(fVACount - numToRemove);
-
-    GrVertexAttrib* dst = fOptVA.get();
-    const GrVertexAttrib* src = fVAPtr;
-
-    for (int i = 0, newIdx = 0; i < fVACount; ++i, ++src) {
-        const GrVertexAttrib& currAttrib = *src;
-        if (currAttrib.fBinding < kGrFixedFunctionVertexAttribBindingCnt) {
-            uint8_t maskCheck = 0x1 << currAttrib.fBinding;
-            if (maskCheck & removeVAFlag) {
-                SkASSERT(-1 != descInfo->fFixedFunctionVertexAttribIndices[currAttrib.fBinding]);
-                descInfo->fFixedFunctionVertexAttribIndices[currAttrib.fBinding] = -1;
-                continue;
-            }
-            descInfo->fFixedFunctionVertexAttribIndices[currAttrib.fBinding] = newIdx;
-        }
-        memcpy(dst, src, sizeof(GrVertexAttrib));
-        ++newIdx;
-        ++dst;
-    }
-    fVACount -= numToRemove;
-    fVAPtr = fOptVA.get();
-}
-
 static void get_stage_stats(const GrFragmentStage& stage, bool* readsDst, bool* readsFragPosition) {
     if (stage.getProcessor()->willReadDstColor()) {
         *readsDst = true;
     }
     if (stage.getProcessor()->willReadFragmentPosition()) {
         *readsFragPosition = true;
     }
 }
 
 void GrOptDrawState::getStageStats(const GrDrawState& ds, int firstColorStageIdx,
-                                   int firstCoverageStageIdx, GrProgramDesc::DescInfo* descInfo) {
+                                   int firstCoverageStageIdx, bool hasLocalCoords,
+                                   GrProgramDesc::DescInfo* descInfo) {
     // We will need a local coord attrib if there is one currently set on the optState and we are
     // actually generating some effect code
-    descInfo->fRequiresLocalCoordAttrib = descInfo->hasLocalCoordAttribute() &&
+    descInfo->fRequiresLocalCoordAttrib = hasLocalCoords &&
         ds.numTotalStages() - firstColorStageIdx - firstCoverageStageIdx > 0;
 
     descInfo->fReadsDst = false;
     descInfo->fReadsFragPosition = false;
 
     for (int s = firstColorStageIdx; s < ds.numColorStages(); ++s) {
         const GrFragmentStage& stage = ds.getColorStage(s);
         get_stage_stats(stage, &descInfo->fReadsDst, &descInfo->fReadsFragPosition);
     }
     for (int s = firstCoverageStageIdx; s < ds.numCoverageStages(); ++s) {
         const GrFragmentStage& stage = ds.getCoverageStage(s);
         get_stage_stats(stage, &descInfo->fReadsDst, &descInfo->fReadsFragPosition);
     }
     if (ds.hasGeometryProcessor()) {
         const GrGeometryProcessor& gp = *ds.getGeometryProcessor();
         descInfo->fReadsFragPosition = descInfo->fReadsFragPosition || gp.willReadFragmentPosition();
     }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 bool GrOptDrawState::operator== (const GrOptDrawState& that) const {
     if (this->fDesc != that.fDesc) {
         return false;
     }
-    bool usingVertexColors = that.fDesc.header().fColorAttributeIndex != -1;
-    if (!usingVertexColors && this->fColor != that.fColor) {
+    bool hasVertexColors = this->fDesc.header().fColorInput == GrProgramDesc::kAttribute_ColorInput;
+    if (!hasVertexColors && this->fColor != that.fColor) {
         return false;
     }
 
     if (this->getRenderTarget() != that.getRenderTarget() ||
         this->fScissorState != that.fScissorState ||
         !this->fViewMatrix.cheapEqualTo(that.fViewMatrix) ||
         this->fSrcBlend != that.fSrcBlend ||
         this->fDstBlend != that.fDstBlend ||
         this->fBlendConstant != that.fBlendConstant ||
         this->fFlags != that.fFlags ||
-        this->fVACount != that.fVACount ||
-        this->fVAStride != that.fVAStride ||
-        memcmp(this->fVAPtr, that.fVAPtr, this->fVACount * sizeof(GrVertexAttrib)) ||
         this->fStencilSettings != that.fStencilSettings ||
         this->fDrawFace != that.fDrawFace ||
         this->fDstCopy.texture() != that.fDstCopy.texture()) {
         return false;
     }
 
-    bool usingVertexCoverage = this->fDesc.header().fCoverageAttributeIndex != -1;
-    if (!usingVertexCoverage && this->fCoverage != that.fCoverage) {
+    bool hasVertexCoverage =
+            this->fDesc.header().fCoverageInput == GrProgramDesc::kAttribute_ColorInput;
+    if (!hasVertexCoverage && this->fCoverage != that.fCoverage) {
         return false;
     }
 
     if (this->hasGeometryProcessor()) {
         if (!that.hasGeometryProcessor()) {
             return false;
         } else if (!this->getGeometryProcessor()->isEqual(*that.getGeometryProcessor())) {
             return false;
         }
     } else if (that.hasGeometryProcessor()) {
         return false;
     }
 
     // The program desc comparison should have already assured that the stage counts match.
     SkASSERT(this->numFragmentStages() == that.numFragmentStages());
     for (int i = 0; i < this->numFragmentStages(); i++) {
 
         if (this->getFragmentStage(i) != that.getFragmentStage(i)) {
             return false;
         }
     }
     return true;
 }