Chromium Code Reviews| Index: src/gpu/GrPendingFragmentStage.h |
| diff --git a/src/gpu/GrPendingFragmentStage.h b/src/gpu/GrPendingFragmentStage.h |
| index 0bf984ab7d68ced7be7fdc79637ac6201372a822..5e5b10f335fb3c3d925d07696170348c624d5b05 100644 |
| --- a/src/gpu/GrPendingFragmentStage.h |
| +++ b/src/gpu/GrPendingFragmentStage.h |
| @@ -5,49 +5,21 @@ |
| * found in the LICENSE file. |
| */ |
| -#ifndef GrPendingProcessorStage_DEFINED |
| -#define GrPendingProcessorStage_DEFINED |
| +#ifndef GrPendingFragmentStage_DEFINED |
| +#define GrPendingFragmentStage_DEFINED |
| -#include "GrFragmentStage.h" |
| -#include "GrCoordTransform.h" |
| -#include "GrFragmentProcessor.h" |
| +#include "GrStagedProcessor.h" |
| #include "GrPendingProgramElement.h" |
| /** |
|
robertphillips
2015/07/13 19:12:29
This _is_ ... ?
|
| - * This a baked variant of GrFragmentStage, as recorded in GrOptDrawState. |
| + * This a baked variant of GrFragmentStage, as recorded in GrPipeline |
| */ |
| -class GrPendingFragmentStage { |
| +class GrPendingFragmentStage : public GrStagedProcessor<GrPendingProgramElement> { |
| public: |
| - GrPendingFragmentStage(const GrFragmentStage& stage) : fProc(stage.processor()) {} |
| + GrPendingFragmentStage(const GrFragmentStage& stage) : INHERITED(stage.processor()) {} |
| - GrPendingFragmentStage(const GrPendingFragmentStage& that) { *this = that; } |
| - |
| - GrPendingFragmentStage& operator=(const GrPendingFragmentStage& that) { |
| - fProc.reset(that.fProc.get()); |
| - return *this; |
| - } |
| - |
| - bool operator==(const GrPendingFragmentStage& that) const { |
| - return this->processor()->isEqual(*that.processor()); |
| - } |
| - |
| - bool operator!=(const GrPendingFragmentStage& that) const { return !(*this == that); } |
| - |
| - /** |
| - * For a coord transform on the fragment processor, does it or the coord change matrix (if |
| - * relevant) contain perspective? |
| - */ |
| - bool isPerspectiveCoordTransform(int matrixIndex) const { |
| - const GrCoordTransform& coordTransform = this->processor()->coordTransform(matrixIndex); |
| - uint32_t type = coordTransform.getMatrix().getType(); |
| - return SkToBool(SkMatrix::kPerspective_Mask & type); |
| - } |
| - |
| - const char* name() const { return fProc->name(); } |
| - |
| - const GrFragmentProcessor* processor() const { return fProc.get(); } |
| - |
| -protected: |
| - GrPendingProgramElement<const GrFragmentProcessor> fProc; |
| +private: |
| + typedef GrStagedProcessor<GrPendingProgramElement> INHERITED; |
| }; |
| + |
| #endif |