diff options
author | joshualitt <joshualitt@chromium.org> | 2015-01-14 08:12:47 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-01-14 08:12:47 -0800 |
commit | 71c9260e6fa1798ad1e41b2c2ae9b3cce08bb610 (patch) | |
tree | 6dcf4f549ee113669d8becc37c83225fcba36ba5 /src/gpu/effects/GrBitmapTextGeoProc.h | |
parent | 95145a9d3e0be24769c4c4e3810058e08b06fd3b (diff) |
More changes to bring together path / geo procs
BUG=skia:
Review URL: https://codereview.chromium.org/820783005
Diffstat (limited to 'src/gpu/effects/GrBitmapTextGeoProc.h')
-rw-r--r-- | src/gpu/effects/GrBitmapTextGeoProc.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gpu/effects/GrBitmapTextGeoProc.h b/src/gpu/effects/GrBitmapTextGeoProc.h index 399678ab2a..d73fba83e5 100644 --- a/src/gpu/effects/GrBitmapTextGeoProc.h +++ b/src/gpu/effects/GrBitmapTextGeoProc.h @@ -32,9 +32,9 @@ public: const char* name() const SK_OVERRIDE { return "Texture"; } - const GrAttribute* inPosition() const { return fInPosition; } - const GrAttribute* inColor() const { return fInColor; } - const GrAttribute* inTextureCoords() const { return fInTextureCoords; } + const Attribute* inPosition() const { return fInPosition; } + const Attribute* inColor() const { return fInColor; } + const Attribute* inTextureCoords() const { return fInTextureCoords; } virtual void getGLProcessorKey(const GrBatchTracker& bt, const GrGLCaps& caps, @@ -57,9 +57,9 @@ private: void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE; GrTextureAccess fTextureAccess; - const GrAttribute* fInPosition; - const GrAttribute* fInColor; - const GrAttribute* fInTextureCoords; + const Attribute* fInPosition; + const Attribute* fInColor; + const Attribute* fInTextureCoords; GR_DECLARE_GEOMETRY_PROCESSOR_TEST; |