Added patch to fix color key regression causing pink rectangles around text.

This commit is contained in:
Sebastian Lackner
2015-01-08 00:38:19 +01:00
parent ac1ffc70f8
commit cb475f78f9
5 changed files with 66 additions and 1 deletions

View File

@@ -165,6 +165,7 @@ patch_enable_all ()
enable_wined3d_CSMT_Helper="$1"
enable_wined3d_CSMT_Main="$1"
enable_winecfg_Staging="$1"
enable_wined3d_Color_Key="$1"
enable_wined3d_Revert_PixelFormat="$1"
enable_winedevice_Fix_Relocation="$1"
enable_winemenubuilder_Desktop_Icon_Path="$1"
@@ -528,6 +529,9 @@ patch_enable ()
winecfg-Staging)
enable_winecfg_Staging="$2"
;;
wined3d-Color_Key)
enable_wined3d_Color_Key="$2"
;;
wined3d-Revert_PixelFormat)
enable_wined3d_Revert_PixelFormat="$2"
;;
@@ -3056,6 +3060,21 @@ if [ "$enable_winecfg_Staging" -eq 1 ]; then
) >> "$patchlist"
fi
# Patchset wined3d-Color_Key
# |
# | This patchset fixes the following Wine bugs:
# | * [#37748] Fix color key regression causing pink rectangles around text
# |
# | Modified files:
# | * dlls/wined3d/surface.c
# |
if [ "$enable_wined3d_Color_Key" -eq 1 ]; then
patch_apply wined3d-Color_Key/0001-wined3d-Use-proper-color-key-type-define-when-callin.patch
(
echo '+ { "Christian Costa", "wined3d: Use proper color key type define when calling wined3d_texture_set_color_key.", 1 },';
) >> "$patchlist"
fi
# Patchset wined3d-Revert_PixelFormat
# |
# | This patchset fixes the following Wine bugs:

View File

@@ -0,0 +1,43 @@
From 4e1dac79637c3e4f1e606a3a7fcb6dd2974de7c5 Mon Sep 17 00:00:00 2001
From: Christian Costa <titan.costa@gmail.com>
Date: Thu, 8 Jan 2015 00:16:39 +0100
Subject: wined3d: Use proper color key type define when calling
wined3d_texture_set_color_key.
Fix bug https://bugs.winehq.org/show_bug.cgi?id=37748 which was a regression caused
by commit a8ab56941577a01e17b947cddd374ba52ffd8245.
---
dlls/wined3d/surface.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index fb27c8a..ad41834 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -3687,12 +3687,12 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE
else if (flags & WINEDDBLT_KEYSRCOVERRIDE)
{
/* Use color key from DDBltFx */
- wined3d_texture_set_color_key(src_surface->container, WINEDDSD_CKSRCBLT, &DDBltFx->ddckSrcColorkey);
+ wined3d_texture_set_color_key(src_surface->container, WINEDDCKEY_SRCBLT, &DDBltFx->ddckSrcColorkey);
}
else
{
/* Do not use color key */
- wined3d_texture_set_color_key(src_surface->container, WINEDDSD_CKSRCBLT, NULL);
+ wined3d_texture_set_color_key(src_surface->container, WINEDDCKEY_SRCBLT, NULL);
}
surface_blt_to_drawable(device, filter,
@@ -3700,7 +3700,7 @@ 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 */
- wined3d_texture_set_color_key(src_surface->container, WINEDDSD_CKSRCBLT,
+ wined3d_texture_set_color_key(src_surface->container, WINEDDCKEY_SRCBLT,
(old_color_key_flags & WINEDDSD_CKSRCBLT) ? &old_blt_key : NULL);
surface_validate_location(dst_surface, dst_surface->container->resource.draw_binding);
--
2.2.1

View File

@@ -0,0 +1 @@
Fixes: [37748] Fix color key regression causing pink rectangles around text