Index: src/gpu/GrOptDrawState.h |
diff --git a/src/gpu/GrOptDrawState.h b/src/gpu/GrOptDrawState.h |
index 1c439bbff132e2d55fa822609f211d3e2bb73a00..f47913a41ae049b2b214ac166a1291f4c09bf3a2 100644 |
--- a/src/gpu/GrOptDrawState.h |
+++ b/src/gpu/GrOptDrawState.h |
@@ -127,7 +127,7 @@ public: |
} |
bool hasGeometryProcessor() const { return SkToBool(fGeometryProcessor.get()); } |
- const GrGeometryStage* getGeometryProcessor() const { return fGeometryProcessor.get(); } |
+ const GrGeometryProcessor* getGeometryProcessor() const { return fGeometryProcessor.get(); } |
const GrFragmentStage& getColorStage(int idx) const { |
SkASSERT(idx < this->numColorStages()); |
return fFragmentStages[idx]; |
@@ -441,11 +441,12 @@ private: |
GrBlendCoeff fDstBlend; |
typedef SkSTArray<8, GrFragmentStage> FragmentStageArray; |
- SkAutoTDelete<GrGeometryStage> fGeometryProcessor; |
- FragmentStageArray fFragmentStages; |
+ typedef GrProgramElementRef<const GrGeometryProcessor> ProgramGeometryProcessor; |
+ ProgramGeometryProcessor fGeometryProcessor; |
+ FragmentStageArray fFragmentStages; |
// This function is equivalent to the offset into fFragmentStages where coverage stages begin. |
- int fNumColorStages; |
+ int fNumColorStages; |
// This is simply a different representation of info in fVertexAttribs and thus does |
// not need to be compared in op==. |