Nikolay Sivov : d2d1/commandlist: Handle recording in RestoreDrawingState().
Alexandre Julliard
julliard at winehq.org
Wed Aug 3 15:30:40 CDT 2022
Module: wine
Branch: master
Commit: c9d36114e6f46e54e5e1773668f833324c0df06b
URL: https://gitlab.winehq.org/wine/wine/-/commit/c9d36114e6f46e54e5e1773668f833324c0df06b
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Mon Aug 1 17:20:15 2022 +0300
d2d1/commandlist: Handle recording in RestoreDrawingState().
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
dlls/d2d1/device.c | 24 +++++++++++++++++++-----
1 file changed, 19 insertions(+), 5 deletions(-)
diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c
index 0c75e6510a5..f92e5f18d5d 100644
--- a/dlls/d2d1/device.c
+++ b/dlls/d2d1/device.c
@@ -1625,16 +1625,30 @@ static void STDMETHODCALLTYPE d2d_device_context_RestoreDrawingState(ID2D1Device
ID2D1DrawingStateBlock *state_block)
{
struct d2d_state_block *state_block_impl = unsafe_impl_from_ID2D1DrawingStateBlock(state_block);
- struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface);
+ struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface);
TRACE("iface %p, state_block %p.\n", iface, state_block);
- render_target->drawing_state = state_block_impl->drawing_state;
+ if (context->target.type == D2D_TARGET_COMMAND_LIST)
+ {
+ struct d2d_command_list *command_list = context->target.command_list;
+
+ if (context->drawing_state.antialiasMode != state_block_impl->drawing_state.antialiasMode)
+ d2d_command_list_set_antialias_mode(command_list, state_block_impl->drawing_state.antialiasMode);
+ d2d_command_list_set_text_antialias_mode(command_list, state_block_impl->drawing_state.textAntialiasMode);
+ d2d_command_list_set_tags(command_list, state_block_impl->drawing_state.tag1, state_block_impl->drawing_state.tag2);
+ d2d_command_list_set_transform(command_list, &state_block_impl->drawing_state.transform);
+ d2d_command_list_set_primitive_blend(command_list, state_block_impl->drawing_state.primitiveBlend);
+ d2d_command_list_set_unit_mode(command_list, state_block_impl->drawing_state.unitMode);
+ d2d_command_list_set_text_rendering_params(command_list, state_block_impl->text_rendering_params);
+ }
+
+ context->drawing_state = state_block_impl->drawing_state;
if (state_block_impl->text_rendering_params)
IDWriteRenderingParams_AddRef(state_block_impl->text_rendering_params);
- if (render_target->text_rendering_params)
- IDWriteRenderingParams_Release(render_target->text_rendering_params);
- render_target->text_rendering_params = state_block_impl->text_rendering_params;
+ if (context->text_rendering_params)
+ IDWriteRenderingParams_Release(context->text_rendering_params);
+ context->text_rendering_params = state_block_impl->text_rendering_params;
}
static void STDMETHODCALLTYPE d2d_device_context_PushAxisAlignedClip(ID2D1DeviceContext1 *iface,
More information about the wine-cvs
mailing list