Added patch to avoid setting DDCAPS_ALIGNBOUNDARYSRC as cap for ddraw.

This commit is contained in:
Sebastian Lackner 2017-01-15 02:29:50 +01:00
parent 577b85bdc8
commit 1261a0540c
3 changed files with 46 additions and 0 deletions

View File

@ -389,6 +389,7 @@ patch_enable_all ()
enable_wined3d_Accounting="$1"
enable_wined3d_CSMT_Helper="$1"
enable_wined3d_CSMT_Main="$1"
enable_wined3d_DDCAPS_ALIGNBOUNDARYSRC="$1"
enable_wined3d_DXTn="$1"
enable_wined3d_GTX_560M="$1"
enable_wined3d_Limit_Vram="$1"
@ -1372,6 +1373,9 @@ patch_enable ()
wined3d-CSMT_Main)
enable_wined3d_CSMT_Main="$2"
;;
wined3d-DDCAPS_ALIGNBOUNDARYSRC)
enable_wined3d_DDCAPS_ALIGNBOUNDARYSRC="$2"
;;
wined3d-DXTn)
enable_wined3d_DXTn="$2"
;;
@ -8215,6 +8219,21 @@ if test "$enable_wined3d_CSMT_Helper" -eq 1; then
) >> "$patchlist"
fi
# Patchset wined3d-DDCAPS_ALIGNBOUNDARYSRC
# |
# | This patchset fixes the following Wine bugs:
# | * [#28672] Do not set DDCAPS_ALIGNBOUNDARYSRC as cap for ddraw
# |
# | Modified files:
# | * dlls/wined3d/directx.c
# |
if test "$enable_wined3d_DDCAPS_ALIGNBOUNDARYSRC" -eq 1; then
patch_apply wined3d-DDCAPS_ALIGNBOUNDARYSRC/0001-wined3d-Do-not-set-DDCAPS_ALIGNBOUNDARYSRC-as-cap-fo.patch
(
echo '+ { "Michael Müller", "wined3d: Do not set DDCAPS_ALIGNBOUNDARYSRC as cap for ddraw.", 1 },';
) >> "$patchlist"
fi
# Patchset wined3d-GTX_560M
# |
# | Modified files:

View File

@ -0,0 +1,26 @@
From 14c8ab57c3147379cdfee828f9e12a2210978e65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 15 Jan 2017 01:16:26 +0100
Subject: wined3d: Do not set DDCAPS_ALIGNBOUNDARYSRC as cap for ddraw.
---
dlls/wined3d/directx.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index edd640a507c..8616277dd2b 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -5820,8 +5820,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte
WINEDDCAPS_CANCLIP |
WINEDDCAPS_CANCLIPSTRETCHED |
WINEDDCAPS_COLORKEY |
- WINEDDCAPS_COLORKEYHWASSIST |
- WINEDDCAPS_ALIGNBOUNDARYSRC;
+ WINEDDCAPS_COLORKEYHWASSIST;
/* Fill the ddraw caps structure */
caps->ddraw_caps.caps = WINEDDCAPS_GDI |
--
2.11.0

View File

@ -0,0 +1 @@
Fixes: [28672] Do not set DDCAPS_ALIGNBOUNDARYSRC as cap for ddraw