diff options
| author |  sugoi@google.com <sugoi@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-12-06 20:13:11 +0000 |
|---|---|---|
| committer | sugoi@google.com <sugoi@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-12-06 20:13:11 +0000 |
| commit | 12b4e27ae1a29460e91a59f38122483e1faec697 (patch) | |
| tree | ed783f409c707e748cd0db8c635a6e97d328886d /src/gpu/gl | |
| parent | df6fe603a592be6495a61b4ad2e8b8fad452c2ac (diff) | |
As part of preliminary groundwork for a chromium fix, this changelist is deprecating GrPathFill so that SkPath::FillType is used everywhere in order to remove some code duplication between Skia and Ganesh.
BUG=chromium:135111
TEST=Try path rendering tests from the gm
Review URL: https://codereview.appspot.com/6875058
git-svn-id: http://skia.googlecode.com/svn/trunk@6693 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/gl')
| -rw-r--r-- | src/gpu/gl/GrGpuGL.cpp | 12 | ||||
| -rw-r--r-- | src/gpu/gl/GrGpuGL.h | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/gpu/gl/GrGpuGL.cpp b/src/gpu/gl/GrGpuGL.cpp index eb60539fbf..f01fd3f082 100644 --- a/src/gpu/gl/GrGpuGL.cpp +++ b/src/gpu/gl/GrGpuGL.cpp @@ -1681,13 +1681,13 @@ const GrStencilSettings& even_odd_nv_path_stencil_settings() { void GrGpuGL::setStencilPathSettings(const GrPath&, - GrPathFill fill, + SkPath::FillType fill, GrStencilSettings* settings) { switch (fill) { - case kEvenOdd_GrPathFill: + case SkPath::kEvenOdd_FillType: *settings = even_odd_nv_path_stencil_settings(); return; - case kWinding_GrPathFill: + case SkPath::kWinding_FillType: *settings = winding_nv_path_stencil_settings(); return; default: @@ -1695,7 +1695,7 @@ void GrGpuGL::setStencilPathSettings(const GrPath&, } } -void GrGpuGL::onGpuStencilPath(const GrPath* path, GrPathFill fill) { +void GrGpuGL::onGpuStencilPath(const GrPath* path, SkPath::FillType fill) { GrAssert(fCaps.pathStencilingSupport()); GrGLuint id = static_cast<const GrGLPath*>(path)->pathID(); @@ -1711,14 +1711,14 @@ void GrGpuGL::onGpuStencilPath(const GrPath* path, GrPathFill fill) { GrAssert(!fStencilSettings.isTwoSided()); GrGLenum fillMode; switch (fill) { - case kWinding_GrPathFill: + case SkPath::kWinding_FillType: fillMode = GR_GL_COUNT_UP; GrAssert(kIncClamp_StencilOp == fStencilSettings.passOp(GrStencilSettings::kFront_Face)); GrAssert(kIncClamp_StencilOp == fStencilSettings.failOp(GrStencilSettings::kFront_Face)); break; - case kEvenOdd_GrPathFill: + case SkPath::kEvenOdd_FillType: fillMode = GR_GL_INVERT; GrAssert(kInvert_StencilOp == fStencilSettings.passOp(GrStencilSettings::kFront_Face)); diff --git a/src/gpu/gl/GrGpuGL.h b/src/gpu/gl/GrGpuGL.h index 7f74d8e65c..33834cf709 100644 --- a/src/gpu/gl/GrGpuGL.h +++ b/src/gpu/gl/GrGpuGL.h @@ -104,10 +104,10 @@ protected: uint32_t numVertices) SK_OVERRIDE; virtual void setStencilPathSettings(const GrPath&, - GrPathFill, + SkPath::FillType, GrStencilSettings* settings) SK_OVERRIDE; - virtual void onGpuStencilPath(const GrPath*, GrPathFill) SK_OVERRIDE; + virtual void onGpuStencilPath(const GrPath*, SkPath::FillType) SK_OVERRIDE; virtual void clearStencil() SK_OVERRIDE; virtual void clearStencilClip(const GrIRect& rect, |