diff options
Diffstat (limited to 'src/gpu/effects/GrBitmapTextGeoProc.h')
-rw-r--r-- | src/gpu/effects/GrBitmapTextGeoProc.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/gpu/effects/GrBitmapTextGeoProc.h b/src/gpu/effects/GrBitmapTextGeoProc.h index 5e444977c2..40ba8559e5 100644 --- a/src/gpu/effects/GrBitmapTextGeoProc.h +++ b/src/gpu/effects/GrBitmapTextGeoProc.h @@ -36,12 +36,12 @@ public: const char* name() const override { return "Texture"; } - const Attribute& inPosition() const { return fInPosition; } - const Attribute& inColor() const { return fInColor; } - const Attribute& inTextureCoords() const { return fInTextureCoords; } + const Attribute* inPosition() const { return fInPosition; } + const Attribute* inColor() const { return fInColor; } + const Attribute* inTextureCoords() const { return fInTextureCoords; } GrMaskFormat maskFormat() const { return fMaskFormat; } GrColor color() const { return fColor; } - bool hasVertexColor() const { return fInColor.isInitialized(); } + bool hasVertexColor() const { return SkToBool(fInColor); } const SkMatrix& localMatrix() const { return fLocalMatrix; } bool usesW() const { return fUsesW; } @@ -58,15 +58,13 @@ private: const GrSamplerState& params, GrMaskFormat format, const SkMatrix& localMatrix, bool usesW); - const Attribute& onVertexAttribute(int i) const override; - GrColor fColor; SkMatrix fLocalMatrix; bool fUsesW; TextureSampler fTextureSamplers[kMaxTextures]; - Attribute fInPosition; - Attribute fInColor; - Attribute fInTextureCoords; + const Attribute* fInPosition; + const Attribute* fInColor; + const Attribute* fInTextureCoords; GrMaskFormat fMaskFormat; GR_DECLARE_GEOMETRY_PROCESSOR_TEST |