diff options
| -rw-r--r-- | expectations/gm/ignored-tests.txt | 84 | ||||
| -rw-r--r-- | gyp/skia_for_android_framework_defines.gypi | 2 | ||||
| -rw-r--r-- | gyp/skia_for_chromium_defines.gypi | 2 | ||||
| -rw-r--r-- | src/core/SkPath.cpp | 5 | ||||
| -rw-r--r-- | src/pathops/SkOpEdgeBuilder.cpp | 4 |
5 files changed, 90 insertions, 7 deletions
diff --git a/expectations/gm/ignored-tests.txt b/expectations/gm/ignored-tests.txt index 0c54ce9001..b1e6588f8b 100644 --- a/expectations/gm/ignored-tests.txt +++ b/expectations/gm/ignored-tests.txt @@ -39,3 +39,87 @@ blurrects # sugoi https://codereview.chromium.org/646213004/ # New shadow only option in SkDropShadowImageFilter dropshadowimagefilter + +# reed/egdaniel -- new conic code +bigmatrix +bitmaprect_i +bitmaprect_s +bitmapshaders +blurcircles +blurroundrect-WH-100x100-unevenCorners +blurs +c_gms +circles +circular-clips +complexclip2_path_aa +complexclip2_rrect_aa +complexclip3_complex +complexclip3_simple +convexpaths +dashing2 +drrect +emboss +extractbitmap +fatpathfill +filltypes +filltypespersp +gpusamplerstress +hairlines +image-surface +imagefiltersclipped +imagefiltersscaled +lerpmode +lumafilter +mixed_xfermodes +nested_aa +nested_bw +ninepatch-stretch +ovals +patheffect +pathfill +pathinterior +pathinvfill +pathopsskpclip +peekpixels +pictureshader +pictureshadertile +points +radial_gradient2 +rects +roundrects +rrect +rrect_clip_aa +rrect_clip_bw +rrect_draw_aa +rrect_draw_bw +simpleaaclip_aaclip +simpleaaclip_path +simpleblurroundrect +spritebitmap +srcmode +stroke-fill +strokerect +strokes_round +tablecolorfilter +testimagefilters +texteffects +tiledscaledbitmap +twopointconical +verttext +bezier_conic_effects +bezier_cubic_effects +bezier_quad_effects +dcshader +drawlooper +filterfastbounds +path-reverse +strokes3 +texture_domain_effect +inverse_paths +complexclip2_rrect_bw +multipicturedraw_rrectclip_tiled +imagefiltersbase +hairmodes +imagefilterscropped +multipicturedraw_rrectclip_simple +aarectmodes diff --git a/gyp/skia_for_android_framework_defines.gypi b/gyp/skia_for_android_framework_defines.gypi index 779af88b4e..e793a7eeda 100644 --- a/gyp/skia_for_android_framework_defines.gypi +++ b/gyp/skia_for_android_framework_defines.gypi @@ -22,6 +22,8 @@ 'SK_SUPPORT_LEGACY_PORTER_DUFF', 'SK_SUPPORT_LEGACY_DRAWDATA', 'SK_SUPPORT_LEGACY_CANVAS_VIRTUAL', + 'SK_SUPPORT_LEGACY_ADDOVAL', + 'SK_SUPPORT_LEGACY_ADDRRECT', ], }, } diff --git a/gyp/skia_for_chromium_defines.gypi b/gyp/skia_for_chromium_defines.gypi index afc17c527b..6bfcb63378 100644 --- a/gyp/skia_for_chromium_defines.gypi +++ b/gyp/skia_for_chromium_defines.gypi @@ -15,6 +15,8 @@ 'skia_for_chromium_defines': [ 'SK_SUPPORT_LEGACY_DRAWDATA', 'SK_SUPPORT_LEGACY_CANVAS_VIRTUAL', + 'SK_SUPPORT_LEGACY_ADDOVAL', + 'SK_SUPPORT_LEGACY_ADDRRECT', ], }, } diff --git a/src/core/SkPath.cpp b/src/core/SkPath.cpp index 128a0cf3e4..23c00e06f7 100644 --- a/src/core/SkPath.cpp +++ b/src/core/SkPath.cpp @@ -14,11 +14,6 @@ #include "SkRRect.h" #include "SkThread.h" -// These two should be removed once we fix any gpu bugs, and then -// just move them into skia_for_chromium_defines.gypi -#define SK_SUPPORT_LEGACY_ADDOVAL -#define SK_SUPPORT_LEGACY_ADDRRECT - //////////////////////////////////////////////////////////////////////////// /** diff --git a/src/pathops/SkOpEdgeBuilder.cpp b/src/pathops/SkOpEdgeBuilder.cpp index 8503af301d..803a5f4739 100644 --- a/src/pathops/SkOpEdgeBuilder.cpp +++ b/src/pathops/SkOpEdgeBuilder.cpp @@ -111,8 +111,8 @@ int SkOpEdgeBuilder::preFetch() { for (int i = 0; i < nQuads; ++i) { fPathVerbs.push_back(SkPath::kQuad_Verb); } - fPathPts.push_back_n(nQuads * 2, quadPts); - curve[0] = quadPts[nQuads * 2 - 1]; + fPathPts.push_back_n(nQuads * 2, &quadPts[1]); + curve[0] = pts[2]; lastCurve = true; } continue; |