Module: wine Branch: master Commit: 6722d3ad7f8331d7892c8c0562c74248b07fcccc URL: https://gitlab.winehq.org/wine/wine/-/commit/6722d3ad7f8331d7892c8c0562c7424...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Tue Aug 2 19:31:56 2022 +0300
d2d1/commandlist: Implement FillMesh() command.
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com
---
dlls/d2d1/command_list.c | 34 ++++++++++++++++++++++++++++++++++ dlls/d2d1/d2d1_private.h | 2 ++ dlls/d2d1/device.c | 5 +++++ 3 files changed, 41 insertions(+)
diff --git a/dlls/d2d1/command_list.c b/dlls/d2d1/command_list.c index a8faeb01eb8..84170b0efb1 100644 --- a/dlls/d2d1/command_list.c +++ b/dlls/d2d1/command_list.c @@ -35,6 +35,7 @@ enum d2d_command_type D2D_COMMAND_DRAW_GEOMETRY, D2D_COMMAND_DRAW_RECTANGLE, D2D_COMMAND_DRAW_BITMAP, + D2D_COMMAND_FILL_MESH, D2D_COMMAND_FILL_GEOMETRY, D2D_COMMAND_FILL_RECTANGLE, D2D_COMMAND_PUSH_CLIP, @@ -129,6 +130,13 @@ struct d2d_command_draw_rectangle ID2D1StrokeStyle *stroke_style; };
+struct d2d_command_fill_mesh +{ + struct d2d_command c; + ID2D1Mesh *mesh; + ID2D1Brush *brush; +}; + struct d2d_command_fill_geometry { struct d2d_command c; @@ -333,6 +341,12 @@ static HRESULT STDMETHODCALLTYPE d2d_command_list_Stream(ID2D1CommandList *iface c->interpolation_mode, c->src_rect, c->perspective_transform); break; } + case D2D_COMMAND_FILL_MESH: + { + const struct d2d_command_fill_mesh *c = data; + hr = ID2D1CommandSink_FillMesh(sink, c->mesh, c->brush); + break; + } case D2D_COMMAND_FILL_GEOMETRY: { const struct d2d_command_fill_geometry *c = data; @@ -866,3 +880,23 @@ void d2d_command_list_draw_bitmap(struct d2d_command_list *command_list, ID2D1Bi d2d_command_list_write_field(&data, &command->src_rect, src_rect, sizeof(*src_rect)); d2d_command_list_write_field(&data, &command->perspective_transform, perspective_transform, sizeof(*perspective_transform)); } + +void d2d_command_list_fill_mesh(struct d2d_command_list *command_list, const struct d2d_device_context *context, + ID2D1Mesh *mesh, ID2D1Brush *orig_brush) +{ + struct d2d_command_fill_mesh *command; + ID2D1Brush *brush; + + if (FAILED(d2d_command_list_create_brush(command_list, context, orig_brush, &brush))) + { + command_list->state = D2D_COMMAND_LIST_STATE_ERROR; + return; + } + + d2d_command_list_reference_object(command_list, mesh); + + command = d2d_command_list_require_space(command_list, sizeof(*command)); + command->c.op = D2D_COMMAND_FILL_MESH; + command->mesh = mesh; + command->brush = brush; +} diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 5675509d520..a9982fcaeb9 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -768,6 +768,8 @@ void d2d_command_list_draw_glyph_run(struct d2d_command_list *command_list, void d2d_command_list_draw_bitmap(struct d2d_command_list *command_list, ID2D1Bitmap *bitmap, const D2D1_RECT_F *dst_rect, float opacity, D2D1_INTERPOLATION_MODE interpolation_mode, const D2D1_RECT_F *src_rect, const D2D1_MATRIX_4X4_F *perspective_transform) DECLSPEC_HIDDEN; +void d2d_command_list_fill_mesh(struct d2d_command_list *command_list, const struct d2d_device_context *context, + ID2D1Mesh *mesh, ID2D1Brush *orig_brush) DECLSPEC_HIDDEN;
static inline BOOL d2d_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) { diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 64a4cae9d1b..576915ea0fd 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1084,7 +1084,12 @@ static void STDMETHODCALLTYPE d2d_device_context_FillGeometry(ID2D1DeviceContext static void STDMETHODCALLTYPE d2d_device_context_FillMesh(ID2D1DeviceContext1 *iface, ID2D1Mesh *mesh, ID2D1Brush *brush) { + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + FIXME("iface %p, mesh %p, brush %p stub!\n", iface, mesh, brush); + + if (context->target.type == D2D_TARGET_COMMAND_LIST) + d2d_command_list_fill_mesh(context->target.command_list, context, mesh, brush); }
static void STDMETHODCALLTYPE d2d_device_context_FillOpacityMask(ID2D1DeviceContext1 *iface,