Module: wine Branch: master Commit: 3ec96c9b80ef198ac0731df0ea45116348b473e0 URL: https://gitlab.winehq.org/wine/wine/-/commit/3ec96c9b80ef198ac0731df0ea45116...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Mon Aug 1 16:45:32 2022 +0300
d2d1/commandlist: Implement DrawGeometry() command.
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com
---
dlls/d2d1/command_list.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/d2d1/d2d1_private.h | 3 +++ dlls/d2d1/device.c | 3 ++- 3 files changed, 45 insertions(+), 1 deletion(-)
diff --git a/dlls/d2d1/command_list.c b/dlls/d2d1/command_list.c index 58d6819dc4a..a4b9af02c32 100644 --- a/dlls/d2d1/command_list.c +++ b/dlls/d2d1/command_list.c @@ -30,6 +30,7 @@ enum d2d_command_type D2D_COMMAND_SET_UNIT_MODE, D2D_COMMAND_CLEAR, D2D_COMMAND_DRAW_LINE, + D2D_COMMAND_DRAW_GEOMETRY, D2D_COMMAND_PUSH_CLIP, D2D_COMMAND_POP_CLIP, }; @@ -98,6 +99,15 @@ struct d2d_command_draw_line ID2D1StrokeStyle *stroke_style; };
+struct d2d_command_draw_geometry +{ + struct d2d_command c; + ID2D1Geometry *geometry; + ID2D1Brush *brush; + float stroke_width; + ID2D1StrokeStyle *stroke_style; +}; + static inline struct d2d_command_list *impl_from_ID2D1CommandList(ID2D1CommandList *iface) { return CONTAINING_RECORD(iface, struct d2d_command_list, ID2D1CommandList_iface); @@ -233,6 +243,13 @@ static HRESULT STDMETHODCALLTYPE d2d_command_list_Stream(ID2D1CommandList *iface c->stroke_style); break; } + case D2D_COMMAND_DRAW_GEOMETRY: + { + const struct d2d_command_draw_geometry *c = data; + hr = ID2D1CommandSink_DrawGeometry(sink, c->geometry, c->brush, c->stroke_width, + c->stroke_style); + break; + } case D2D_COMMAND_PUSH_CLIP: { const struct d2d_command_push_clip *c = data; @@ -530,3 +547,26 @@ void d2d_command_list_draw_line(struct d2d_command_list *command_list, command->stroke_width = stroke_width; command->stroke_style = stroke_style; } + +void d2d_command_list_draw_geometry(struct d2d_command_list *command_list, + const struct d2d_device_context *context, ID2D1Geometry *geometry, ID2D1Brush *orig_brush, + float stroke_width, ID2D1StrokeStyle *stroke_style) +{ + struct d2d_command_draw_geometry *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, geometry); + d2d_command_list_reference_object(command_list, stroke_style); + + command = d2d_command_list_require_space(command_list, sizeof(*command)); + command->c.op = D2D_COMMAND_DRAW_GEOMETRY; + command->brush = brush; + command->stroke_width = stroke_width; + command->stroke_style = stroke_style; +} diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index c57306e1a3d..eb09dfa7109 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -749,6 +749,9 @@ void d2d_command_list_clear(struct d2d_command_list *command_list, const D2D1_CO void d2d_command_list_draw_line(struct d2d_command_list *command_list, const struct d2d_device_context *context, D2D1_POINT_2F p0, D2D1_POINT_2F p1, ID2D1Brush *orig_brush, float stroke_width, ID2D1StrokeStyle *stroke_style) DECLSPEC_HIDDEN; +void d2d_command_list_draw_geometry(struct d2d_command_list *command_list, + const struct d2d_device_context *context, ID2D1Geometry *geometry, ID2D1Brush *orig_brush, + float stroke_width, ID2D1StrokeStyle *stroke_style) 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 cac4ddd9ea5..f2b1b194c95 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -950,7 +950,8 @@ static void STDMETHODCALLTYPE d2d_device_context_DrawGeometry(ID2D1DeviceContext
if (context->target.type == D2D_TARGET_COMMAND_LIST) { - FIXME("Unimplemented for command list target.\n"); + d2d_command_list_draw_geometry(context->target.command_list, context, geometry, brush, + stroke_width, stroke_style); return; }