From c92ffa58c07c4f683efbab3e0bddfa90bf9bcd90 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 11 Jun 2016 19:33:18 +0200
Subject: [PATCH] Rebase against 2a5b4fd884801a7f394ade49142fbfdba195243c.

---
 patches/patchinstall.sh                        | 2 +-
 patches/wined3d-CSMT_Main/9999-IfDefined.patch | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 9b48c9f7..7faff3b9 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "9cc95e5a1d930d72892949a3ddf8fa00d471af88"
+	echo "2a5b4fd884801a7f394ade49142fbfdba195243c"
 }
 
 # Show version information
diff --git a/patches/wined3d-CSMT_Main/9999-IfDefined.patch b/patches/wined3d-CSMT_Main/9999-IfDefined.patch
index 83761170..bda3004a 100644
--- a/patches/wined3d-CSMT_Main/9999-IfDefined.patch
+++ b/patches/wined3d-CSMT_Main/9999-IfDefined.patch
@@ -6962,7 +6962,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
 diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
 --- a/dlls/wined3d/utils.c
 +++ b/dlls/wined3d/utils.c
-@@ -4331,7 +4331,11 @@
+@@ -4464,7 +4464,11 @@
          float y_offset = context->render_offscreen
                  ? (center_offset - (2.0f * y) - h) / h
                  : (center_offset - (2.0f * y) - h) / -h;
@@ -6974,7 +6974,7 @@ diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
                  state->render_states[WINED3D_RS_ZENABLE] : WINED3D_ZB_FALSE;
          float z_scale = zenable ? 2.0f : 0.0f;
          float z_offset = zenable ? -1.0f : 0.0f;
-@@ -5128,7 +5132,11 @@
+@@ -5261,7 +5265,11 @@
                  break;
          }
      }