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

Rebase against d6654dbf2b38d02f3c6e0ede706a0388cd7cd4a6

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2018-04-27 08:32:43 +10:00
parent 48e37a9f7c
commit 9e260976b4
2 changed files with 1 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
patches/d3d11-Silence_FIXMEs/0001-d3d11-Silence-ID3D11Device_GetDeviceRemovedReason.patch
View File

@ -1,25 +0,0 @@
From d359c245dd87648c1f2002c2a865271c4c9aff8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 28 May 2017 05:45:01 +0200
Subject: d3d11: Silence ID3D11Device_GetDeviceRemovedReason.
---
dlls/d3d11/device.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
index bc28b4a5446..c78a4a755d8 100644
--- a/dlls/d3d11/device.c
+++ b/dlls/d3d11/device.c
@@ -5749,7 +5749,7 @@ static UINT STDMETHODCALLTYPE d3d11_device_GetCreationFlags(ID3D11Device *iface)
static HRESULT STDMETHODCALLTYPE d3d11_device_GetDeviceRemovedReason(ID3D11Device *iface)
{
- FIXME("iface %p stub!\n", iface);
+ TRACE("iface %p stub!\n", iface);
return S_OK;
}
--
2.12.2

18
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "5e74b9ea945db50bd31cef3254865f6cd9544eb2"
echo "d6654dbf2b38d02f3c6e0ede706a0388cd7cd4a6"
}
# Show version information
@ -110,7 +110,6 @@ patch_enable_all ()
enable_crypt32_MS_Root_Certs="$1"
enable_d3d11_Deferred_Context="$1"
enable_d3d11_Depth_Bias="$1"
enable_d3d11_Silence_FIXMEs="$1"
enable_d3d8_ValidateShader="$1"
enable_d3d9_DesktopWindow="$1"
enable_d3d9_Tests="$1"
@ -521,9 +520,6 @@ patch_enable ()
d3d11-Depth_Bias)
enable_d3d11_Depth_Bias="$2"
;;
d3d11-Silence_FIXMEs)
enable_d3d11_Silence_FIXMEs="$2"
;;
d3d8-ValidateShader)
enable_d3d8_ValidateShader="$2"
;;
@ -3118,18 +3114,6 @@ if test "$enable_d3d11_Depth_Bias" -eq 1; then
) >> "$patchlist"
fi
# Patchset d3d11-Silence_FIXMEs
# |
# | Modified files:
# | * dlls/d3d11/device.c
# |
if test "$enable_d3d11_Silence_FIXMEs" -eq 1; then
patch_apply d3d11-Silence_FIXMEs/0001-d3d11-Silence-ID3D11Device_GetDeviceRemovedReason.patch
(
printf '%s\n' '+ { "Michael Müller", "d3d11: Silence ID3D11Device_GetDeviceRemovedReason.", 1 },';
) >> "$patchlist"
fi
# Patchset d3d8-ValidateShader
# |
# | This patchset fixes the following Wine bugs: