wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge ddraw-ZBufferBitDepths into ddraw-Device_Caps.

Browse Source
This commit is contained in:
Sebastian Lackner 2016-03-04 23:10:56 +01:00
parent e8acd0e522
commit 0dcb058c09
4 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
patches/ddraw-ZBufferBitDepths/0001-ddraw-Set-dwZBufferBitDepth-in-ddraw7_GetCaps.patch → patches/ddraw-Device_Caps/0002-ddraw-Set-dwZBufferBitDepth-in-ddraw7_GetCaps.patch
View File

1
patches/ddraw-Device_Caps/definition
View File

@ -1 +1,2 @@
Fixes: Don't set HWTRANSFORMANDLIGHT flag on d3d7 RGB device
Fixes: [27002] Properly initialize caps->dwZBufferBitDepths in ddraw7_GetCaps

1
patches/ddraw-ZBufferBitDepths/definition
View File

@ -1 +0,0 @@
Fixes: [27002] Properly initialize caps->dwZBufferBitDepths in ddraw7_GetCaps

24
patches/patchinstall.sh
View File

@ -131,7 +131,6 @@ patch_enable_all ()
enable_ddraw_IDirect3DTexture2_Load="$1"
enable_ddraw_Rendering_Targets="$1"
enable_ddraw_Write_Vtable="$1"
enable_ddraw_ZBufferBitDepths="$1"
enable_ddraw_d3d_execute_buffer="$1"
enable_dinput_DIPROP_USERNAME="$1"
enable_dinput_Initialize="$1"
@ -552,9 +551,6 @@ patch_enable ()
ddraw-Write_Vtable)
enable_ddraw_Write_Vtable="$2"
;;
ddraw-ZBufferBitDepths)
enable_ddraw_ZBufferBitDepths="$2"
;;
ddraw-d3d_execute_buffer)
enable_ddraw_d3d_execute_buffer="$2"
;;
@ -3264,13 +3260,18 @@ fi
# Patchset ddraw-Device_Caps
# |
# | This patchset fixes the following Wine bugs:
# | * [#27002] Properly initialize caps->dwZBufferBitDepths in ddraw7_GetCaps
# |
# | Modified files:
# | * dlls/ddraw/ddraw.c, dlls/ddraw/tests/ddraw7.c
# |
if test "$enable_ddraw_Device_Caps" -eq 1; then
patch_apply ddraw-Device_Caps/0001-ddraw-Don-t-set-HWTRANSFORMANDLIGHT-flag-on-d3d7-RGB.patch
patch_apply ddraw-Device_Caps/0002-ddraw-Set-dwZBufferBitDepth-in-ddraw7_GetCaps.patch
(
echo '+ { "Michael Müller", "ddraw: Don'\''t set HWTRANSFORMANDLIGHT flag on d3d7 RGB device.", 1 },';
echo '+ { "Michael Müller", "ddraw: Set dwZBufferBitDepth in ddraw7_GetCaps.", 1 },';
) >> "$patchlist"
fi
@ -3353,21 +3354,6 @@ if test "$enable_ddraw_Write_Vtable" -eq 1; then
) >> "$patchlist"
fi
# Patchset ddraw-ZBufferBitDepths
# |
# | This patchset fixes the following Wine bugs:
# | * [#27002] Properly initialize caps->dwZBufferBitDepths in ddraw7_GetCaps
# |
# | Modified files:
# | * dlls/ddraw/ddraw.c
# |
if test "$enable_ddraw_ZBufferBitDepths" -eq 1; then
patch_apply ddraw-ZBufferBitDepths/0001-ddraw-Set-dwZBufferBitDepth-in-ddraw7_GetCaps.patch
(
echo '+ { "Michael Müller", "ddraw: Set dwZBufferBitDepth in ddraw7_GetCaps.", 1 },';
) >> "$patchlist"
fi
# Patchset ddraw-d3d_execute_buffer
# |
# | Modified files: