Index: include/gpu/GrProcessorStage.h |
diff --git a/include/gpu/GrProcessorStage.h b/include/gpu/GrProcessorStage.h |
index 5cc06e78db3c298568535bb1aaf4ee523bf564ba..c961572c1dcc5076993a2409513186e6f971ec8b 100644 |
--- a/include/gpu/GrProcessorStage.h |
+++ b/include/gpu/GrProcessorStage.h |
@@ -24,16 +24,14 @@ |
// is immutable, and only owns pending execution refs. This requries removing the common base |
// class from GrDrawState and GrOptDrawState called GrRODrawState and converting to GrOptDrawState |
// when draws are enqueued in the GrInOrderDrawBuffer. |
-class GrProcessorStage { |
+class GrFragmentStage { |
public: |
- explicit GrProcessorStage(const GrProcessor* proc) |
+ explicit GrFragmentStage(const GrFragmentProcessor* proc) |
: fProc(SkRef(proc)) { |
fCoordChangeMatrixSet = false; |
} |
- virtual ~GrProcessorStage() {} |
- |
- GrProcessorStage(const GrProcessorStage& other) { |
+ GrFragmentStage(const GrFragmentStage& other) { |
fCoordChangeMatrixSet = other.fCoordChangeMatrixSet; |
if (other.fCoordChangeMatrixSet) { |
fCoordChangeMatrix = other.fCoordChangeMatrix; |
@@ -41,7 +39,7 @@ public: |
fProc.initAndRef(other.fProc); |
} |
- static bool AreCompatible(const GrProcessorStage& a, const GrProcessorStage& b, |
+ static bool AreCompatible(const GrFragmentStage& a, const GrFragmentStage& b, |
bool usingExplicitLocalCoords) { |
SkASSERT(a.fProc.get()); |
SkASSERT(b.fProc.get()); |
@@ -90,7 +88,7 @@ public: |
SkMatrix fCoordChangeMatrix; |
SkDEBUGCODE(mutable uint32_t fEffectUniqueID;) |
- friend class GrProcessorStage; |
+ friend class GrFragmentStage; |
}; |
/** |
@@ -149,38 +147,14 @@ public: |
} |
} |
- virtual const GrProcessor* getProcessor() const = 0; |
+ const GrFragmentProcessor* getProcessor() const { return fProc.get(); } |
void convertToPendingExec() { fProc.convertToPendingExec(); } |
protected: |
- bool fCoordChangeMatrixSet; |
- SkMatrix fCoordChangeMatrix; |
- GrProgramElementRef<const GrProcessor> fProc; |
-}; |
- |
-class GrFragmentStage : public GrProcessorStage { |
-public: |
- GrFragmentStage(const GrFragmentProcessor* fp) : GrProcessorStage(fp) {} |
- |
- virtual const GrFragmentProcessor* getProcessor() const { |
- return static_cast<const GrFragmentProcessor*>(fProc.get()); |
- } |
- |
- typedef GrFragmentProcessor Processor; |
- typedef GrGLFragmentProcessor GLProcessor; |
-}; |
- |
-class GrGeometryStage : public GrProcessorStage { |
-public: |
- GrGeometryStage(const GrGeometryProcessor* gp) : GrProcessorStage(gp) {} |
- |
- virtual const GrGeometryProcessor* getProcessor() const { |
- return static_cast<const GrGeometryProcessor*>(fProc.get()); |
- } |
- |
- typedef GrGeometryProcessor Processor; |
- typedef GrGLGeometryProcessor GLProcessor; |
+ bool fCoordChangeMatrixSet; |
+ SkMatrix fCoordChangeMatrix; |
+ GrProgramElementRef<const GrFragmentProcessor> fProc; |
}; |
#endif |