diff options
author | 2014-10-10 14:11:59 -0700 | |
---|---|---|
committer | 2014-10-10 14:11:59 -0700 | |
commit | 89c7a2ec3e9f7e1b9705214f450bb12288799da9 (patch) | |
tree | 846fda99f953334024ec35a748bc307a3a1cb936 /src/gpu/GrDrawState.h | |
parent | 93bee71a41701eb6cb55fe6df50f3a4081cc8a01 (diff) |
Revert of Opt state takes a GP instead of a GeometryStage (patchset #18 id:1500001 of https://codereview.chromium.org/637003003/)
Reason for revert:
Revert because this may be causing a break in a chrome gpu test
Original issue's description:
> Opt state takes a GP instead of a GeometryStage
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/71856d520461ae025a0332aa0ce9735a096d9baf
TBR=bsalomon@google.com,egdaniel@google.com,danakj@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/647183002
Diffstat (limited to 'src/gpu/GrDrawState.h')
-rw-r--r-- | src/gpu/GrDrawState.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/gpu/GrDrawState.h b/src/gpu/GrDrawState.h index d58d8c64e7..03af7b532f 100644 --- a/src/gpu/GrDrawState.h +++ b/src/gpu/GrDrawState.h @@ -221,7 +221,7 @@ public: const GrGeometryProcessor* setGeometryProcessor(const GrGeometryProcessor* geometryProcessor) { SkASSERT(geometryProcessor); SkASSERT(!this->hasGeometryProcessor()); - fGeometryProcessor.reset(SkRef(geometryProcessor)); + fGeometryProcessor.reset(new GrGeometryStage(geometryProcessor)); this->invalidateOptState(); return geometryProcessor; } @@ -254,7 +254,7 @@ public: } bool hasGeometryProcessor() const { return SkToBool(fGeometryProcessor.get()); } - const GrGeometryProcessor* getGeometryProcessor() const { return fGeometryProcessor.get(); } + const GrGeometryStage* getGeometryProcessor() const { return fGeometryProcessor.get(); } const GrFragmentStage& getColorStage(int idx) const { return fColorStages[idx]; } const GrFragmentStage& getCoverageStage(int idx) const { return fCoverageStages[idx]; } @@ -485,7 +485,8 @@ public: GrDrawState* fDrawState; SkMatrix fViewMatrix; int fNumColorStages; - SkAutoSTArray<8, GrFragmentStage::SavedCoordChange> fSavedCoordChanges; + bool fHasGeometryProcessor; + SkAutoSTArray<8, GrProcessorStage::SavedCoordChange> fSavedCoordChanges; }; /// @} @@ -809,11 +810,10 @@ private: GrBlendCoeff fSrcBlend; GrBlendCoeff fDstBlend; - typedef SkSTArray<4, GrFragmentStage> FragmentStageArray; - typedef GrProgramElementRef<const GrGeometryProcessor> ProgramGeometryProcessor; - ProgramGeometryProcessor fGeometryProcessor; - FragmentStageArray fColorStages; - FragmentStageArray fCoverageStages; + typedef SkSTArray<4, GrFragmentStage> FragmentStageArray; + SkAutoTDelete<GrGeometryStage> fGeometryProcessor; + FragmentStageArray fColorStages; + FragmentStageArray fCoverageStages; uint32_t fHints; |