diff options
author | 2016-07-21 08:18:05 -0700 | |
---|---|---|
committer | 2016-07-21 08:18:05 -0700 | |
commit | 5d1676c751040f4d9a6259720c15250f0c979874 (patch) | |
tree | c60d5cc8b6aa5bdd963802d0a6656a2f297cd56f /src/gpu/GrPipelineBuilder.h | |
parent | 9f071d1fa5978c0f6a75506351e0b05a6759de61 (diff) |
Revert of Remove DrawFace enum from GrPipelineBuilder (patchset #2 id:20001 of https://codereview.chromium.org/2165283002/ )
Reason for revert:
No Vulkan bot in CQ :(
Original issue's description:
> Remove DrawFace enum from GrPipelineBuilder
>
> This gets GrPipelineBuilder.h out of the headers
>
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2165283002
>
> Committed: https://skia.googlesource.com/skia/+/da152ebb032c61bb2561bbb3e9a78037ad174d34
TBR=bsalomon@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review-Url: https://codereview.chromium.org/2167193002
Diffstat (limited to 'src/gpu/GrPipelineBuilder.h')
-rw-r--r-- | src/gpu/GrPipelineBuilder.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/gpu/GrPipelineBuilder.h b/src/gpu/GrPipelineBuilder.h index dca7f36034..06c843fe53 100644 --- a/src/gpu/GrPipelineBuilder.h +++ b/src/gpu/GrPipelineBuilder.h @@ -266,19 +266,27 @@ public: /// @name Face Culling //// + enum DrawFace { + kInvalid_DrawFace = -1, + + kBoth_DrawFace, + kCCW_DrawFace, + kCW_DrawFace, + }; + /** * Gets whether the target is drawing clockwise, counterclockwise, * or both faces. * @return the current draw face(s). */ - GrDrawFace getDrawFace() const { return fDrawFace; } + DrawFace getDrawFace() const { return fDrawFace; } /** * Controls whether clockwise, counterclockwise, or both faces are drawn. * @param face the face(s) to draw. */ - void setDrawFace(GrDrawFace face) { - SkASSERT(GrDrawFace::kInvalid != face); + void setDrawFace(DrawFace face) { + SkASSERT(kInvalid_DrawFace != face); fDrawFace = face; } @@ -297,7 +305,7 @@ private: uint32_t fFlags; const GrUserStencilSettings* fUserStencilSettings; - GrDrawFace fDrawFace; + DrawFace fDrawFace; mutable sk_sp<GrXPFactory> fXPFactory; FragmentProcessorArray fColorFragmentProcessors; FragmentProcessorArray fCoverageFragmentProcessors; |