From 6ea30a2e5bb2cbf25d9f945f55076e5c53c648e1 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Sat, 21 May 2022 16:19:49 +1000
Subject: [PATCH] Rebase against 230e953e31f7228d10c8b0a0d2e8cf4f9af9a231.

---
 ...Add-support-for-FOURCC-surface-to-save_dds_.patch | 12 ++++++------
 patches/patchinstall.sh                              |  2 +-
 staging/upstream-commit                              |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/patches/d3dx9_36-DDS/0001-d3dx9_36-Add-support-for-FOURCC-surface-to-save_dds_.patch b/patches/d3dx9_36-DDS/0001-d3dx9_36-Add-support-for-FOURCC-surface-to-save_dds_.patch
index c60dd875..9e0b73c6 100644
--- a/patches/d3dx9_36-DDS/0001-d3dx9_36-Add-support-for-FOURCC-surface-to-save_dds_.patch
+++ b/patches/d3dx9_36-DDS/0001-d3dx9_36-Add-support-for-FOURCC-surface-to-save_dds_.patch
@@ -1,7 +1,7 @@
-From cfbee3f0f952769dbf663489c2a209493c7412d3 Mon Sep 17 00:00:00 2001
+From 5d9d9cbdb4043848aa5ebdd8a1349d9c876650e3 Mon Sep 17 00:00:00 2001
 From: Christian Costa <titan.costa@gmail.com>
 Date: Sun, 11 Jan 2015 16:18:03 +0100
-Subject: d3dx9_36: Add support for FOURCC surface to
+Subject: [PATCH] d3dx9_36: Add support for FOURCC surface to
  save_dds_surface_to_memory.
 
 ---
@@ -9,10 +9,10 @@ Subject: d3dx9_36: Add support for FOURCC surface to
  1 file changed, 8 insertions(+)
 
 diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c
-index 4fa2a76..58b676d 100644
+index 26809a47e18..db334ee83f1 100644
 --- a/dlls/d3dx9_36/surface.c
 +++ b/dlls/d3dx9_36/surface.c
-@@ -311,6 +311,14 @@ static HRESULT d3dformat_to_dds_pixel_format(struct dds_pixel_format *pixel_form
+@@ -433,6 +433,14 @@ static HRESULT d3dformat_to_dds_pixel_format(struct dds_pixel_format *pixel_form
          }
      }
  
@@ -24,9 +24,9 @@ index 4fa2a76..58b676d 100644
 +        return D3D_OK;
 +    }
 +
-     WARN("Unknown pixel format %#x\n", d3dformat);
+     WARN("Unknown pixel format %#x.\n", d3dformat);
      return E_NOTIMPL;
  }
 -- 
-2.6.4
+2.35.1
 
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 8c784b31..1e746091 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "56d9ed83c14cd7d92076fc518d1a601fa3119b6b"
+	echo "230e953e31f7228d10c8b0a0d2e8cf4f9af9a231"
 }
 
 # Show version information
diff --git a/staging/upstream-commit b/staging/upstream-commit
index 1a57c413..818d173a 100644
--- a/staging/upstream-commit
+++ b/staging/upstream-commit
@@ -1 +1 @@
-56d9ed83c14cd7d92076fc518d1a601fa3119b6b
+230e953e31f7228d10c8b0a0d2e8cf4f9af9a231