diff options
author | Robert Phillips <robertphillips@google.com> | 2017-05-09 08:15:18 -0400 |
---|---|---|
committer | Robert Phillips <robertphillips@google.com> | 2017-05-09 12:31:37 +0000 |
commit | 6410d29e1173b49b7319d7389db7c533e27bb3d2 (patch) | |
tree | 4e5b0433b2fdf9edd27628883c1fad816c6edb93 | |
parent | d2da87d0b8d127da0530c661618f059eb1cc0f1e (diff) |
Remove 'fDrawFace' from GrPipeline
This will, hopefully, unblock the roll.
Change-Id: I2e33ccca7161334cdecd881e2699ae0c61ba2a31
Reviewed-on: https://skia-review.googlesource.com/16101
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
-rw-r--r-- | src/gpu/GrPipeline.cpp | 3 | ||||
-rw-r--r-- | src/gpu/GrPipeline.h | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/gpu/GrPipeline.cpp b/src/gpu/GrPipeline.cpp index 489a4a91e3..7c0338c77c 100644 --- a/src/gpu/GrPipeline.cpp +++ b/src/gpu/GrPipeline.cpp @@ -132,8 +132,7 @@ bool GrPipeline::AreEqual(const GrPipeline& a, const GrPipeline& b) { a.fScissorState != b.fScissorState || a.fWindowRectsState != b.fWindowRectsState || a.fFlags != b.fFlags || - a.fUserStencilSettings != b.fUserStencilSettings || - a.fDrawFace != b.fDrawFace) { + a.fUserStencilSettings != b.fUserStencilSettings) { return false; } diff --git a/src/gpu/GrPipeline.h b/src/gpu/GrPipeline.h index 3483d2bed4..67e137c82a 100644 --- a/src/gpu/GrPipeline.h +++ b/src/gpu/GrPipeline.h @@ -243,7 +243,6 @@ private: GrScissorState fScissorState; GrWindowRectsState fWindowRectsState; const GrUserStencilSettings* fUserStencilSettings; - uint16_t fDrawFace; uint16_t fFlags; sk_sp<const GrXferProcessor> fXferProcessor; FragmentProcessorArray fFragmentProcessors; |