You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-09-12 18:50:20 -07:00
patchupdate.py: Various speed optimizations and improvements, removed several patches (accepted upstream).
This commit is contained in:
@@ -27,7 +27,6 @@ PATCHLIST := \
|
||||
atl-IOCS_Property.ok \
|
||||
comctl32-LoadIconMetric.ok \
|
||||
configure-Absolute_RPATH.ok \
|
||||
configure-Detect_Gnutls.ok \
|
||||
d3d9-Surface_Refcount.ok \
|
||||
d3dx9_36-DXTn.ok \
|
||||
d3dx9_36-Filter_Warnings.ok \
|
||||
@@ -109,7 +108,6 @@ PATCHLIST := \
|
||||
wineboot-HKEY_DYN_DATA.ok \
|
||||
winebuild-LinkerVersion.ok \
|
||||
wined3d-DXTn.ok \
|
||||
wined3d-FFP_Fog.ok \
|
||||
wined3d-Revert_PixelFormat.ok \
|
||||
winedevice-Fix_Relocation.ok \
|
||||
winemenubuilder-Desktop_Icon_Path.ok \
|
||||
@@ -332,18 +330,6 @@ configure-Absolute_RPATH.ok:
|
||||
echo '+ { "Sebastian Lackner", "configure: Also add the absolute RPATH when linking against libwine.", 1 },'; \
|
||||
) > configure-Absolute_RPATH.ok
|
||||
|
||||
# Patchset configure-Detect_Gnutls
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * configure.ac
|
||||
# |
|
||||
.INTERMEDIATE: configure-Detect_Gnutls.ok
|
||||
configure-Detect_Gnutls.ok:
|
||||
$(call APPLY_FILE,configure-Detect_Gnutls/0001-configure-Fix-detection-of-gnutls-on-Ubuntu-14.10.patch)
|
||||
@( \
|
||||
echo '+ { "Sebastian Lackner", "configure: Fix detection of gnutls on Ubuntu 14.10.", 3 },'; \
|
||||
) > configure-Detect_Gnutls.ok
|
||||
|
||||
# Patchset d3d9-Surface_Refcount
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
@@ -1693,21 +1679,6 @@ wined3d-DXTn.ok:
|
||||
echo '+ { "Michael Müller", "wined3d: add DXT1 to B4G4R4A4, DXT1 to B5G5R5A1 and DXT3 to B4G4R4A4 conversion.", 1 },'; \
|
||||
) > wined3d-DXTn.ok
|
||||
|
||||
# Patchset wined3d-FFP_Fog
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/d3d8/tests/visual.c, dlls/d3d9/tests/visual.c, dlls/ddraw/tests/ddraw7.c, dlls/wined3d/directx.c,
|
||||
# | dlls/wined3d/glsl_shader.c
|
||||
# |
|
||||
.INTERMEDIATE: wined3d-FFP_Fog.ok
|
||||
wined3d-FFP_Fog.ok:
|
||||
$(call APPLY_FILE,wined3d-FFP_Fog/0001-wined3d-Set-D3DPMISCCAPS_FOGVERTEXCLAMPED-flag-in-ge.patch)
|
||||
$(call APPLY_FILE,wined3d-FFP_Fog/0002-wined3d-Take-abs-of-vertex-z-coordinate-as-FFP-fog-c.patch)
|
||||
@( \
|
||||
echo '+ { "Joachim Priesner", "wined3d: Set D3DPMISCCAPS_FOGVERTEXCLAMPED flag in get_device_caps (resend).", 1 },'; \
|
||||
echo '+ { "Joachim Priesner", "wined3d: Take abs() of vertex z coordinate as FFP fog coordinate.", 7 },'; \
|
||||
) > wined3d-FFP_Fog.ok
|
||||
|
||||
# Patchset wined3d-Revert_PixelFormat
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
|
@@ -1,25 +0,0 @@
|
||||
From 3ec0224addff16f803d8d49feb0a4a232c48ebcd Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Sun, 7 Sep 2014 08:09:54 +0200
|
||||
Subject: configure: Fix detection of gnutls on Ubuntu 14.10. (try 3)
|
||||
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 2bc0008..c22b119 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1360,7 +1360,7 @@ then
|
||||
[AC_CHECK_HEADER(gnutls/gnutls.h,
|
||||
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gnutls/gnutls.h>
|
||||
#include <gnutls/crypto.h>]], [[static typeof(gnutls_mac_get_key_size) *func; if (func) return 0;]])],
|
||||
- [WINE_CHECK_SONAME(gnutls,gnutls_global_init,,[GNUTLS_CFLAGS=""],[$GNUTLS_LIBS])])],
|
||||
+ [WINE_CHECK_SONAME(gnutls,gnutls_global_init,,[GNUTLS_CFLAGS=""],[$GNUTLS_LIBS],[[libgnutls\\(-deb0\\)\\{0,1\\}]])])],
|
||||
[GNUTLS_CFLAGS=""])])
|
||||
fi
|
||||
WINE_WARNING_WITH(gnutls,[test "x$ac_cv_lib_soname_gnutls" = "x"],
|
||||
--
|
||||
2.1.0
|
||||
|
@@ -1,34 +0,0 @@
|
||||
From 77f3334105cbefa51452f8d7ad68c7ba5b797837 Mon Sep 17 00:00:00 2001
|
||||
From: Joachim Priesner <joachim.priesner@web.de>
|
||||
Date: Fri, 14 Nov 2014 22:39:58 +0100
|
||||
Subject: wined3d: Set D3DPMISCCAPS_FOGVERTEXCLAMPED flag in get_device_caps
|
||||
(resend)
|
||||
|
||||
Wine clamps the oFog output of vertex shaders. Tests for the flag follow
|
||||
in the second part of this patch.
|
||||
---
|
||||
dlls/wined3d/directx.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
|
||||
index 794496b..d31202a 100644
|
||||
--- a/dlls/wined3d/directx.c
|
||||
+++ b/dlls/wined3d/directx.c
|
||||
@@ -4165,12 +4165,12 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte
|
||||
WINED3DPMISCCAPS_CLIPPLANESCALEDPOINTS |
|
||||
WINED3DPMISCCAPS_MASKZ |
|
||||
WINED3DPMISCCAPS_BLENDOP |
|
||||
+ WINED3DPMISCCAPS_FOGVERTEXCLAMPED |
|
||||
WINED3DPMISCCAPS_MRTPOSTPIXELSHADERBLENDING;
|
||||
/* TODO:
|
||||
WINED3DPMISCCAPS_NULLREFERENCE
|
||||
WINED3DPMISCCAPS_FOGANDSPECULARALPHA
|
||||
- WINED3DPMISCCAPS_MRTINDEPENDENTBITDEPTHS
|
||||
- WINED3DPMISCCAPS_FOGVERTEXCLAMPED */
|
||||
+ WINED3DPMISCCAPS_MRTINDEPENDENTBITDEPTHS */
|
||||
|
||||
if (gl_info->supported[EXT_BLEND_EQUATION_SEPARATE] && gl_info->supported[EXT_BLEND_FUNC_SEPARATE])
|
||||
caps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_SEPARATEALPHABLEND;
|
||||
--
|
||||
2.1.3
|
||||
|
File diff suppressed because it is too large
Load Diff
@@ -1 +0,0 @@
|
||||
Fixes: Take abs() of vertex z coordinate as FFP fog coordinate
|
Reference in New Issue
Block a user