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 d3177504b1cbf5029b505588928911be980eebec.

Browse Source
This commit is contained in:
Sebastian Lackner 2015-08-31 16:29:08 +02:00
parent 570e4a6933
commit 7e58e7e2d4
3 changed files with 1 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
patches/d3d11-Fix_Compile/0001-d3d11-Fix-compile-failure-with-recent-version-of-gcc.patch
View File

@ -1,47 +0,0 @@
From a1747217a5bae6416a157f8bcf9286845364a5fe Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 29 Aug 2015 06:24:21 +0200
Subject: d3d11: Fix compile failure with recent version of gcc.
---
dlls/d3d11/utils.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c
index 307ef23..91de43c 100644
--- a/dlls/d3d11/utils.c
+++ b/dlls/d3d11/utils.c
@@ -465,10 +465,10 @@ UINT d3d10_cpu_access_flags_from_d3d11_cpu_access_flags(UINT cpu_access_flags)
UINT d3d11_resource_misc_flags_from_d3d10_resource_misc_flags(UINT resource_misc_flags)
{
- static const UINT bitwise_identical_flags = D3D10_RESOURCE_MISC_GENERATE_MIPS
+ const UINT bitwise_identical_flags = D3D10_RESOURCE_MISC_GENERATE_MIPS
| D3D10_RESOURCE_MISC_SHARED
| D3D10_RESOURCE_MISC_TEXTURECUBE;
- static const UINT handled_flags = bitwise_identical_flags
+ const UINT handled_flags = bitwise_identical_flags
| D3D10_RESOURCE_MISC_SHARED_KEYEDMUTEX
| D3D10_RESOURCE_MISC_GDI_COMPATIBLE;
UINT d3d11_resource_misc_flags = resource_misc_flags & bitwise_identical_flags;
@@ -486,7 +486,7 @@ UINT d3d11_resource_misc_flags_from_d3d10_resource_misc_flags(UINT resource_misc
UINT d3d10_resource_misc_flags_from_d3d11_resource_misc_flags(UINT resource_misc_flags)
{
- static const UINT bitwise_identical_flags = D3D11_RESOURCE_MISC_GENERATE_MIPS
+ const UINT bitwise_identical_flags = D3D11_RESOURCE_MISC_GENERATE_MIPS
| D3D11_RESOURCE_MISC_SHARED
| D3D11_RESOURCE_MISC_TEXTURECUBE
| D3D11_RESOURCE_MISC_BUFFER_STRUCTURED
@@ -496,7 +496,7 @@ UINT d3d10_resource_misc_flags_from_d3d11_resource_misc_flags(UINT resource_misc
| D3D11_RESOURCE_MISC_RESTRICT_SHARED_RESOURCE
| D3D11_RESOURCE_MISC_RESTRICT_SHARED_RESOURCE_DRIVER
| D3D11_RESOURCE_MISC_GUARDED;
- static const UINT handled_flags = bitwise_identical_flags
+ const UINT handled_flags = bitwise_identical_flags
| D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX
| D3D11_RESOURCE_MISC_GDI_COMPATIBLE;
UINT d3d10_resource_misc_flags = resource_misc_flags & bitwise_identical_flags;
--
2.5.0

1
patches/d3d11-Fix_Compile/definition
View File

@ -1 +0,0 @@
Apply-Before: *

18
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "6056a3f1634a72e181fb3a03ca625aaa7720523e"
echo "d3177504b1cbf5029b505588928911be980eebec"
}
# Show version information
@ -95,7 +95,6 @@ patch_enable_all ()
enable_comctl32_LoadIconMetric="$1"
enable_configure_Absolute_RPATH="$1"
enable_crypt32_CMS_Certificates="$1"
enable_d3d11_Fix_Compile="$1"
enable_d3d9_DesktopWindow="$1"
enable_d3d9_Skip_Tests="$1"
enable_d3d9_Surface_Refcount="$1"
@ -370,9 +369,6 @@ patch_enable ()
crypt32-CMS_Certificates)
enable_crypt32_CMS_Certificates="$2"
;;
d3d11-Fix_Compile)
enable_d3d11_Fix_Compile="$2"
;;
d3d9-DesktopWindow)
enable_d3d9_DesktopWindow="$2"
;;
@ -1989,18 +1985,6 @@ if test "$enable_patchlist" -eq 1; then
fi
# Patchset d3d11-Fix_Compile
# |
# | Modified files:
# | * dlls/d3d11/utils.c
# |
if test "$enable_d3d11_Fix_Compile" -eq 1; then
patch_apply d3d11-Fix_Compile/0001-d3d11-Fix-compile-failure-with-recent-version-of-gcc.patch
(
echo '+ { "Sebastian Lackner", "d3d11: Fix compile failure with recent version of gcc.", 1 },';
) >> "$patchlist"
fi
# Patchset Compiler_Warnings
# |
# | Modified files: