[PATCH 2/5] d2d1: Implement d2d_geometry_sink_SetFillMode().
Henri Verbeet
hverbeet at codeweavers.com
Mon Jul 20 04:07:27 CDT 2015
---
dlls/d2d1/d2d1_private.h | 1 +
dlls/d2d1/geometry.c | 19 +++-
dlls/d2d1/tests/d2d1.c | 246 ++++++++++++++++++++++++++---------------------
3 files changed, 153 insertions(+), 113 deletions(-)
diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h
index d6e0ab7..44c8bd5 100644
--- a/dlls/d2d1/d2d1_private.h
+++ b/dlls/d2d1/d2d1_private.h
@@ -229,6 +229,7 @@ struct d2d_geometry
size_t figure_count;
enum d2d_geometry_state state;
+ D2D1_FILL_MODE fill_mode;
UINT32 segment_count;
} path;
struct
diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c
index a94277b..a511104 100644
--- a/dlls/d2d1/geometry.c
+++ b/dlls/d2d1/geometry.c
@@ -514,8 +514,8 @@ static int d2d_cdt_compare_vertices(const void *a, const void *b)
return diff == 0.0f ? 0 : (diff > 0.0f ? 1 : -1);
}
-/* Determine whether a given point is inside the geometry, using the even-odd
- * rule. */
+/* Determine whether a given point is inside the geometry, using the current
+ * fill mode rule. */
static BOOL d2d_path_geometry_point_inside(const struct d2d_geometry *geometry, const D2D1_POINT_2F *probe)
{
const D2D1_POINT_2F *p0, *p1;
@@ -535,11 +535,16 @@ static BOOL d2d_path_geometry_point_inside(const struct d2d_geometry *geometry,
d2d_point_subtract(&v_probe, probe, p0);
if ((probe->y < p0->y) != (probe->y < p1->y) && v_probe.x < v_p.x * (v_probe.y / v_p.y))
- ++score;
+ {
+ if (geometry->u.path.fill_mode == D2D1_FILL_MODE_ALTERNATE || (probe->y < p0->y))
+ ++score;
+ else
+ --score;
+ }
}
}
- return score & 1;
+ return geometry->u.path.fill_mode == D2D1_FILL_MODE_ALTERNATE ? score & 1 : score;
}
static BOOL d2d_path_geometry_add_face(struct d2d_geometry *geometry, const struct d2d_cdt *cdt,
@@ -970,7 +975,11 @@ static ULONG STDMETHODCALLTYPE d2d_geometry_sink_Release(ID2D1GeometrySink *ifac
static void STDMETHODCALLTYPE d2d_geometry_sink_SetFillMode(ID2D1GeometrySink *iface, D2D1_FILL_MODE mode)
{
- FIXME("iface %p, mode %#x stub!\n", iface, mode);
+ struct d2d_geometry *geometry = impl_from_ID2D1GeometrySink(iface);
+
+ TRACE("iface %p, mode %#x.\n", iface, mode);
+
+ geometry->u.path.fill_mode = mode;
}
static void STDMETHODCALLTYPE d2d_geometry_sink_SetSegmentFlags(ID2D1GeometrySink *iface, D2D1_PATH_SEGMENT flags)
diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c
index 1106423..8351dbe 100644
--- a/dlls/d2d1/tests/d2d1.c
+++ b/dlls/d2d1/tests/d2d1.c
@@ -880,6 +880,108 @@ static void test_bitmap_brush(void)
DestroyWindow(window);
}
+static void fill_geometry_sink(ID2D1GeometrySink *sink)
+{
+ D2D1_POINT_2F point;
+
+ set_point(&point, 15.0f, 20.0f);
+ ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED);
+ set_point(&point, 55.0f, 20.0f);
+ ID2D1GeometrySink_AddLine(sink, point);
+ set_point(&point, 55.0f, 220.0f);
+ ID2D1GeometrySink_AddLine(sink, point);
+ set_point(&point, 25.0f, 220.0f);
+ ID2D1GeometrySink_AddLine(sink, point);
+ set_point(&point, 25.0f, 100.0f);
+ ID2D1GeometrySink_AddLine(sink, point);
+ set_point(&point, 75.0f, 100.0f);
+ ID2D1GeometrySink_AddLine(sink, point);
+ set_point(&point, 75.0f, 300.0f);
+ ID2D1GeometrySink_AddLine(sink, point);
+ set_point(&point, 5.0f, 300.0f);
+ ID2D1GeometrySink_AddLine(sink, point);
+ set_point(&point, 5.0f, 60.0f);
+ ID2D1GeometrySink_AddLine(sink, point);
+ set_point(&point, 45.0f, 60.0f);
+ ID2D1GeometrySink_AddLine(sink, point);
+ set_point(&point, 45.0f, 180.0f);
+ ID2D1GeometrySink_AddLine(sink, point);
+ set_point(&point, 35.0f, 180.0f);
+ ID2D1GeometrySink_AddLine(sink, point);
+ set_point(&point, 35.0f, 140.0f);
+ ID2D1GeometrySink_AddLine(sink, point);
+ set_point(&point, 65.0f, 140.0f);
+ ID2D1GeometrySink_AddLine(sink, point);
+ set_point(&point, 65.0f, 260.0f);
+ ID2D1GeometrySink_AddLine(sink, point);
+ set_point(&point, 15.0f, 260.0f);
+ ID2D1GeometrySink_AddLine(sink, point);
+ ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED);
+
+ set_point(&point, 155.0f, 300.0f);
+ ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED);
+ set_point(&point, 155.0f, 160.0f);
+ ID2D1GeometrySink_AddLine(sink, point);
+ set_point(&point, 85.0f, 160.0f);
+ ID2D1GeometrySink_AddLine(sink, point);
+ set_point(&point, 85.0f, 300.0f);
+ ID2D1GeometrySink_AddLine(sink, point);
+ set_point(&point, 120.0f, 300.0f);
+ ID2D1GeometrySink_AddLine(sink, point);
+ set_point(&point, 120.0f, 20.0f);
+ ID2D1GeometrySink_AddLine(sink, point);
+ set_point(&point, 155.0f, 20.0f);
+ ID2D1GeometrySink_AddLine(sink, point);
+ set_point(&point, 155.0f, 160.0f);
+ ID2D1GeometrySink_AddLine(sink, point);
+ set_point(&point, 85.0f, 160.0f);
+ ID2D1GeometrySink_AddLine(sink, point);
+ set_point(&point, 85.0f, 20.0f);
+ ID2D1GeometrySink_AddLine(sink, point);
+ set_point(&point, 120.0f, 20.0f);
+ ID2D1GeometrySink_AddLine(sink, point);
+ set_point(&point, 120.0f, 300.0f);
+ ID2D1GeometrySink_AddLine(sink, point);
+ ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED);
+
+ set_point(&point, 165.0f, 20.0f);
+ ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED);
+ set_point(&point, 165.0f, 300.0f);
+ ID2D1GeometrySink_AddLine(sink, point);
+ set_point(&point, 235.0f, 300.0f);
+ ID2D1GeometrySink_AddLine(sink, point);
+ set_point(&point, 235.0f, 20.0f);
+ ID2D1GeometrySink_AddLine(sink, point);
+ ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED);
+ set_point(&point, 225.0f, 60.0f);
+ ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED);
+ set_point(&point, 225.0f, 260.0f);
+ ID2D1GeometrySink_AddLine(sink, point);
+ set_point(&point, 175.0f, 260.0f);
+ ID2D1GeometrySink_AddLine(sink, point);
+ set_point(&point, 175.0f, 60.0f);
+ ID2D1GeometrySink_AddLine(sink, point);
+ ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED);
+ set_point(&point, 215.0f, 220.0f);
+ ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED);
+ set_point(&point, 185.0f, 220.0f);
+ ID2D1GeometrySink_AddLine(sink, point);
+ set_point(&point, 185.0f, 100.0f);
+ ID2D1GeometrySink_AddLine(sink, point);
+ set_point(&point, 215.0f, 100.0f);
+ ID2D1GeometrySink_AddLine(sink, point);
+ ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED);
+ set_point(&point, 195.0f, 180.0f);
+ ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED);
+ set_point(&point, 205.0f, 180.0f);
+ ID2D1GeometrySink_AddLine(sink, point);
+ set_point(&point, 205.0f, 140.0f);
+ ID2D1GeometrySink_AddLine(sink, point);
+ set_point(&point, 195.0f, 140.0f);
+ ID2D1GeometrySink_AddLine(sink, point);
+ ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED);
+}
+
static void test_path_geometry(void)
{
ID2D1GeometrySink *sink, *tmp_sink;
@@ -912,6 +1014,12 @@ static void test_path_geometry(void)
ok(!!rt, "Failed to create render target.\n");
ID2D1RenderTarget_GetFactory(rt, &factory);
+ ID2D1RenderTarget_SetDpi(rt, 192.0f, 48.0f);
+ ID2D1RenderTarget_SetAntialiasMode(rt, D2D1_ANTIALIAS_MODE_ALIASED);
+ set_color(&color, 0.890f, 0.851f, 0.600f, 1.0f);
+ hr = ID2D1RenderTarget_CreateSolidColorBrush(rt, &color, NULL, &brush);
+ ok(SUCCEEDED(hr), "Failed to create brush, hr %#x.\n", hr);
+
/* Close() when closed. */
hr = ID2D1Factory_CreatePathGeometry(factory, &geometry);
ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr);
@@ -1068,104 +1176,10 @@ static void test_path_geometry(void)
ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr);
hr = ID2D1PathGeometry_Open(geometry, &sink);
ok(SUCCEEDED(hr), "Failed to open geometry sink, hr %#x.\n", hr);
-
- set_point(&point, 15.0f, 20.0f);
- ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED);
- set_point(&point, 55.0f, 20.0f);
- ID2D1GeometrySink_AddLine(sink, point);
- set_point(&point, 55.0f, 220.0f);
- ID2D1GeometrySink_AddLine(sink, point);
- set_point(&point, 25.0f, 220.0f);
- ID2D1GeometrySink_AddLine(sink, point);
- set_point(&point, 25.0f, 100.0f);
- ID2D1GeometrySink_AddLine(sink, point);
- set_point(&point, 75.0f, 100.0f);
- ID2D1GeometrySink_AddLine(sink, point);
- set_point(&point, 75.0f, 300.0f);
- ID2D1GeometrySink_AddLine(sink, point);
- set_point(&point, 5.0f, 300.0f);
- ID2D1GeometrySink_AddLine(sink, point);
- set_point(&point, 5.0f, 60.0f);
- ID2D1GeometrySink_AddLine(sink, point);
- set_point(&point, 45.0f, 60.0f);
- ID2D1GeometrySink_AddLine(sink, point);
- set_point(&point, 45.0f, 180.0f);
- ID2D1GeometrySink_AddLine(sink, point);
- set_point(&point, 35.0f, 180.0f);
- ID2D1GeometrySink_AddLine(sink, point);
- set_point(&point, 35.0f, 140.0f);
- ID2D1GeometrySink_AddLine(sink, point);
- set_point(&point, 65.0f, 140.0f);
- ID2D1GeometrySink_AddLine(sink, point);
- set_point(&point, 65.0f, 260.0f);
- ID2D1GeometrySink_AddLine(sink, point);
- set_point(&point, 15.0f, 260.0f);
- ID2D1GeometrySink_AddLine(sink, point);
- ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED);
-
- set_point(&point, 155.0f, 300.0f);
- ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED);
- set_point(&point, 155.0f, 160.0f);
- ID2D1GeometrySink_AddLine(sink, point);
- set_point(&point, 85.0f, 160.0f);
- ID2D1GeometrySink_AddLine(sink, point);
- set_point(&point, 85.0f, 300.0f);
- ID2D1GeometrySink_AddLine(sink, point);
- set_point(&point, 120.0f, 300.0f);
- ID2D1GeometrySink_AddLine(sink, point);
- set_point(&point, 120.0f, 20.0f);
- ID2D1GeometrySink_AddLine(sink, point);
- set_point(&point, 155.0f, 20.0f);
- ID2D1GeometrySink_AddLine(sink, point);
- set_point(&point, 155.0f, 160.0f);
- ID2D1GeometrySink_AddLine(sink, point);
- set_point(&point, 85.0f, 160.0f);
- ID2D1GeometrySink_AddLine(sink, point);
- set_point(&point, 85.0f, 20.0f);
- ID2D1GeometrySink_AddLine(sink, point);
- set_point(&point, 120.0f, 20.0f);
- ID2D1GeometrySink_AddLine(sink, point);
- set_point(&point, 120.0f, 300.0f);
- ID2D1GeometrySink_AddLine(sink, point);
- ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED);
-
- set_point(&point, 165.0f, 20.0f);
- ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED);
- set_point(&point, 165.0f, 300.0f);
- ID2D1GeometrySink_AddLine(sink, point);
- set_point(&point, 235.0f, 300.0f);
- ID2D1GeometrySink_AddLine(sink, point);
- set_point(&point, 235.0f, 20.0f);
- ID2D1GeometrySink_AddLine(sink, point);
- ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED);
- set_point(&point, 225.0f, 60.0f);
- ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED);
- set_point(&point, 225.0f, 260.0f);
- ID2D1GeometrySink_AddLine(sink, point);
- set_point(&point, 175.0f, 260.0f);
- ID2D1GeometrySink_AddLine(sink, point);
- set_point(&point, 175.0f, 60.0f);
- ID2D1GeometrySink_AddLine(sink, point);
- ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED);
- set_point(&point, 215.0f, 220.0f);
- ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED);
- set_point(&point, 185.0f, 220.0f);
- ID2D1GeometrySink_AddLine(sink, point);
- set_point(&point, 185.0f, 100.0f);
- ID2D1GeometrySink_AddLine(sink, point);
- set_point(&point, 215.0f, 100.0f);
- ID2D1GeometrySink_AddLine(sink, point);
- ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED);
- set_point(&point, 195.0f, 180.0f);
- ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED);
- set_point(&point, 205.0f, 180.0f);
- ID2D1GeometrySink_AddLine(sink, point);
- set_point(&point, 205.0f, 140.0f);
- ID2D1GeometrySink_AddLine(sink, point);
- set_point(&point, 195.0f, 140.0f);
- ID2D1GeometrySink_AddLine(sink, point);
- ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED);
-
+ /* The fillmode that's used is the last one set before the sink is closed. */
+ ID2D1GeometrySink_SetFillMode(sink, D2D1_FILL_MODE_WINDING);
+ fill_geometry_sink(sink);
+ ID2D1GeometrySink_SetFillMode(sink, D2D1_FILL_MODE_ALTERNATE);
hr = ID2D1GeometrySink_Close(sink);
ok(SUCCEEDED(hr), "Failed to close geometry sink, hr %#x.\n", hr);
hr = ID2D1PathGeometry_GetFigureCount(geometry, &count);
@@ -1175,28 +1189,44 @@ static void test_path_geometry(void)
ok(SUCCEEDED(hr), "Failed to get segment count, hr %#x.\n", hr);
/* Intersections don't create extra segments. */
ok(count == 44, "Got unexpected segment count %u.\n", count);
+ ID2D1GeometrySink_SetFillMode(sink, D2D1_FILL_MODE_WINDING);
ID2D1GeometrySink_Release(sink);
- ID2D1RenderTarget_SetDpi(rt, 192.0f, 48.0f);
- ID2D1RenderTarget_SetAntialiasMode(rt, D2D1_ANTIALIAS_MODE_ALIASED);
-
- set_color(&color, 0.890f, 0.851f, 0.600f, 1.0f);
- hr = ID2D1RenderTarget_CreateSolidColorBrush(rt, &color, NULL, &brush);
- ok(SUCCEEDED(hr), "Failed to create brush, hr %#x.\n", hr);
-
ID2D1RenderTarget_BeginDraw(rt);
-
set_color(&color, 0.396f, 0.180f, 0.537f, 1.0f);
ID2D1RenderTarget_Clear(rt, &color);
-
ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)geometry, (ID2D1Brush *)brush, NULL);
-
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
match = compare_surface(surface, "736d9bf019bcf0be264571c1bd954f07752330ab");
ok(match, "Surface does not match.\n");
+ ID2D1PathGeometry_Release(geometry);
+ hr = ID2D1Factory_CreatePathGeometry(factory, &geometry);
+ ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr);
+ hr = ID2D1PathGeometry_Open(geometry, &sink);
+ ok(SUCCEEDED(hr), "Failed to open geometry sink, hr %#x.\n", hr);
+ fill_geometry_sink(sink);
+ ID2D1GeometrySink_SetFillMode(sink, D2D1_FILL_MODE_WINDING);
+ hr = ID2D1GeometrySink_Close(sink);
+ ok(SUCCEEDED(hr), "Failed to close geometry sink, hr %#x.\n", hr);
+ hr = ID2D1PathGeometry_GetFigureCount(geometry, &count);
+ ok(SUCCEEDED(hr), "Failed to get figure count, hr %#x.\n", hr);
+ ok(count == 6, "Got unexpected figure count %u.\n", count);
+ hr = ID2D1PathGeometry_GetSegmentCount(geometry, &count);
+ ok(SUCCEEDED(hr), "Failed to get segment count, hr %#x.\n", hr);
+ ok(count == 44, "Got unexpected segment count %u.\n", count);
+ ID2D1GeometrySink_Release(sink);
+
+ ID2D1RenderTarget_BeginDraw(rt);
+ ID2D1RenderTarget_Clear(rt, &color);
+ ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)geometry, (ID2D1Brush *)brush, NULL);
+ hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
+ ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
+ match = compare_surface(surface, "dd80ed3c218698687156ff4598db3a53917f8476");
+ ok(match, "Surface does not match.\n");
ID2D1PathGeometry_Release(geometry);
+
ID2D1SolidColorBrush_Release(brush);
ID2D1RenderTarget_Release(rt);
refcount = ID2D1Factory_Release(factory);
--
2.1.4
More information about the wine-patches
mailing list