Added patch to take abs() of vertex z coordinate as FFP fog coordinate.

README.md

@@ -39,9 +39,10 @@ Wine. All those differences are also documented on the
 Included bug fixes and improvements
 ===================================
 
-**Bugfixes and features included in the next upcoming release [1]:**
+**Bugfixes and features included in the next upcoming release [2]:**
 
 * Implement exclusive mode in PulseAudio backend ([Wine Bug #37042](https://bugs.winehq.org/show_bug.cgi?id=37042))
+* Take abs() of vertex z coordinate as FFP fog coordinate
 
 
 **Bugs fixed in Wine Staging 1.7.31 [101]:**

debian/changelog

@@ -2,6 +2,7 @@ wine-compholio (1.7.32) UNRELEASED; urgency=low
   * Update patch for SO_CONNECT_TIME and adding better tests.
   * Added patch to ensure dbghelp always checks for debug symbols in BINDIR.
   * Added patch for pulseaudio exclusive mode support.
+  * Added patch to take abs() of vertex z coordinate as FFP fog coordinate.
   * Removed patch to close server fd is there is no space in thread inflight fd list (accepted upstream).
   * Removed patch to fix bugs in StrStr functions (accepted upstream).
   * Removed patches to avoid sending messages in FindWindowExW (accepted upstream).

patches/Makefile

@@ -105,6 +105,7 @@ 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 \
@@ -1608,6 +1609,21 @@ wined3d-DXTn.ok:
 		echo '+    { "Christian Costa", "wined3d: Improve DXTn support and export conversion functions for d3dx9_36.", 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:

patches/wined3d-FFP_Fog/0001-wined3d-Set-D3DPMISCCAPS_FOGVERTEXCLAMPED-flag-in-ge.patch

@@ -0,0 +1,34 @@
+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
+

patches/wined3d-FFP_Fog/definition

@@ -0,0 +1 @@
+Fixes: Take abs() of vertex z coordinate as FFP fog coordinate