From 512d0b1d30bf1cdcc06242f1cd190b5bb3e4bcd8 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Wed, 28 Aug 2019 10:25:51 +1000
Subject: [PATCH] Added wined3d-inverted-objects patchset

---
 patches/patchinstall.sh                       | 21 +++++++++++++++-
 ...-wined3d-Stop-objects-being-inverted.patch | 25 +++++++++++++++++++
 patches/wined3d-inverted-objects/definition   |  1 +
 3 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 patches/wined3d-inverted-objects/0001-wined3d-Stop-objects-being-inverted.patch
 create mode 100644 patches/wined3d-inverted-objects/definition

diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 7c9dbaea..71402a99 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "480bae108c96dfe370feba2680dbefc42ef97571"
+	echo "e001daf5c1f3455ea126a12d92508e5b5d4c5463"
 }
 
 # Show version information
@@ -333,6 +333,7 @@ patch_enable_all ()
 	enable_wined3d_WINED3DFMT_B8G8R8X8_UNORM="$1"
 	enable_wined3d_WINED3D_RS_COLORWRITEENABLE="$1"
 	enable_wined3d_WINED3D_TEXF_ANISOTROPIC="$1"
+	enable_wined3d_inverted_objects="$1"
 	enable_wined3d_mesa_texture_download="$1"
 	enable_wined3d_unset_flip_gdi="$1"
 	enable_wined3d_wined3d_guess_gl_vendor="$1"
@@ -1127,6 +1128,9 @@ patch_enable ()
 		wined3d-WINED3D_TEXF_ANISOTROPIC)
 			enable_wined3d_WINED3D_TEXF_ANISOTROPIC="$2"
 			;;
+		wined3d-inverted-objects)
+			enable_wined3d_inverted_objects="$2"
+			;;
 		wined3d-mesa_texture_download)
 			enable_wined3d_mesa_texture_download="$2"
 			;;
@@ -6862,6 +6866,21 @@ if test "$enable_wined3d_WINED3D_TEXF_ANISOTROPIC" -eq 1; then
 	) >> "$patchlist"
 fi
 
+# Patchset wined3d-inverted-objects
+# |
+# | This patchset fixes the following Wine bugs:
+# |   *	[#47636] wined3d: Correct inverted objects.
+# |
+# | Modified files:
+# |   *	dlls/wined3d/adapter_gl.c
+# |
+if test "$enable_wined3d_inverted_objects" -eq 1; then
+	patch_apply wined3d-inverted-objects/0001-wined3d-Stop-objects-being-inverted.patch
+	(
+		printf '%s\n' '+    { "Henri Verbeet", "wined3d: Stop objects being inverted.", 1 },';
+	) >> "$patchlist"
+fi
+
 # Patchset wined3d-mesa_texture_download
 # |
 # | This patchset fixes the following Wine bugs:
diff --git a/patches/wined3d-inverted-objects/0001-wined3d-Stop-objects-being-inverted.patch b/patches/wined3d-inverted-objects/0001-wined3d-Stop-objects-being-inverted.patch
new file mode 100644
index 00000000..223912a4
--- /dev/null
+++ b/patches/wined3d-inverted-objects/0001-wined3d-Stop-objects-being-inverted.patch
@@ -0,0 +1,25 @@
+From 671c1a56077d680d857d9f1ad45a43bc87aa1589 Mon Sep 17 00:00:00 2001
+From: Henri Verbeet <hverbeet@codeweavers.com>
+Date: Wed, 28 Aug 2019 10:19:04 +1000
+Subject: [PATCH] wined3d: Stop objects being inverted.
+
+Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47636
+---
+ dlls/wined3d/adapter_gl.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c
+index f0602273474..d034a18a940 100644
+--- a/dlls/wined3d/adapter_gl.c
++++ b/dlls/wined3d/adapter_gl.c
+@@ -3956,6 +3956,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter,
+     }
+     fixup_extensions(gl_info, caps_gl_ctx, gl_renderer_str, gl_vendor,
+             gpu_description->vendor, gpu_description->device);
++    d3d_info->clip_control = !!gl_info->supported[ARB_CLIP_CONTROL];
+     wined3d_driver_info_init(driver_info, gpu_description, vram_bytes, 0);
+     TRACE("Reporting (fake) driver version 0x%08x-0x%08x.\n",
+             driver_info->version_high, driver_info->version_low);
+-- 
+2.23.0.rc1
+
diff --git a/patches/wined3d-inverted-objects/definition b/patches/wined3d-inverted-objects/definition
new file mode 100644
index 00000000..1780d316
--- /dev/null
+++ b/patches/wined3d-inverted-objects/definition
@@ -0,0 +1 @@
+Fixes: [47636] wined3d: Correct inverted objects.