reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-12-11 05:14:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

wined3d: Use wined3d_texture_set_color_key() to manipulate the color-key in surface_blt_special().

Browse Source
This commit is contained in:
Henri Verbeet 2014-09-30 07:59:18 +02:00 committed by Alexandre Julliard
parent b3ebdd904c
commit a8ab569415
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/wined3d/surface.c
View File

@ -4116,13 +4116,12 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE
else if (flags & WINEDDBLT_KEYSRCOVERRIDE)
{
/* Use color key from DDBltFx */
src_surface->container->color_key_flags |= WINEDDSD_CKSRCBLT;
src_surface->container->src_blt_color_key = DDBltFx->ddckSrcColorkey;
wined3d_texture_set_color_key(src_surface->container, WINEDDSD_CKSRCBLT, &DDBltFx->ddckSrcColorkey);
}
else
{
/* Do not use color key */
src_surface->container->color_key_flags &= ~WINEDDSD_CKSRCBLT;
wined3d_texture_set_color_key(src_surface->container, WINEDDSD_CKSRCBLT, NULL);
}
surface_blt_to_drawable(device, filter,
@ -4130,8 +4129,8 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE
src_surface, src_rect, dst_surface, dst_rect);
/* Restore the color key parameters */
src_surface->container->color_key_flags = old_color_key_flags;
src_surface->container->src_blt_color_key = old_blt_key;
wined3d_texture_set_color_key(src_surface->container, WINEDDSD_CKSRCBLT,
(old_color_key_flags & WINEDDSD_CKSRCBLT) ? &old_blt_key : NULL);
surface_validate_location(dst_surface, dst_surface->container->resource.draw_binding);
surface_invalidate_location(dst_surface, ~dst_surface->container->resource.draw_binding);