diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 10e15bda..08cf9c5e 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "12c3177ed5cae39de8a9f9111a1cb450296cc8e6"
+	echo "3047385437c7ef36996d0418ac378677f3e9d67c"
 }
 
 # Show version information
diff --git a/patches/wined3d-SWVP-shaders/0002-d3d9-Support-SWVP-vertex-shader-float-constants-limi.patch b/patches/wined3d-SWVP-shaders/0002-d3d9-Support-SWVP-vertex-shader-float-constants-limi.patch
index 3b384037..bd529e1f 100644
--- a/patches/wined3d-SWVP-shaders/0002-d3d9-Support-SWVP-vertex-shader-float-constants-limi.patch
+++ b/patches/wined3d-SWVP-shaders/0002-d3d9-Support-SWVP-vertex-shader-float-constants-limi.patch
@@ -1,4 +1,4 @@
-From 17f5ab15b56b2beb48c7e9b39672e33f3ce7c8b6 Mon Sep 17 00:00:00 2001
+From 3a12873dae3a59fcaf723880f4cfb62c5ca66481 Mon Sep 17 00:00:00 2001
 From: Paul Gofman <gofmanp@gmail.com>
 Date: Mon, 25 Feb 2019 14:24:50 +0300
 Subject: [PATCH] d3d9: Support SWVP vertex shader float constants limits.
@@ -10,7 +10,7 @@ Subject: [PATCH] d3d9: Support SWVP vertex shader float constants limits.
  3 files changed, 29 insertions(+), 9 deletions(-)
 
 diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h
-index ff9a8fec0b0..ed65d20ea70 100644
+index e78ce75a2f0..e2007f962d3 100644
 --- a/dlls/d3d9/d3d9_private.h
 +++ b/dlls/d3d9/d3d9_private.h
 @@ -40,6 +40,7 @@
@@ -31,7 +31,7 @@ index ff9a8fec0b0..ed65d20ea70 100644
  
  struct fvf_declaration
 diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
-index 4ac38c0e899..ea4b259bb17 100644
+index 2693b94ce71..380b1d92ce8 100644
 --- a/dlls/d3d9/device.c
 +++ b/dlls/d3d9/device.c
 @@ -361,7 +361,7 @@ static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapch
@@ -55,7 +55,7 @@ index 4ac38c0e899..ea4b259bb17 100644
      caps->NumSimultaneousRTs = min(D3D_MAX_SIMULTANEOUS_RENDERTARGETS, caps->NumSimultaneousRTs);
  
      if (caps->PixelShaderVersion > 3)
-@@ -724,6 +727,7 @@ static HRESULT WINAPI d3d9_device_GetDirect3D(IDirect3DDevice9Ex *iface, IDirect
+@@ -749,6 +752,7 @@ static HRESULT WINAPI d3d9_device_GetDirect3D(IDirect3DDevice9Ex *iface, IDirect
  static HRESULT WINAPI d3d9_device_GetDeviceCaps(IDirect3DDevice9Ex *iface, D3DCAPS9 *caps)
  {
      struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface);
@@ -63,7 +63,7 @@ index 4ac38c0e899..ea4b259bb17 100644
      struct wined3d_caps wined3d_caps;
      HRESULT hr;
  
-@@ -732,13 +736,15 @@ static HRESULT WINAPI d3d9_device_GetDeviceCaps(IDirect3DDevice9Ex *iface, D3DCA
+@@ -757,13 +761,15 @@ static HRESULT WINAPI d3d9_device_GetDeviceCaps(IDirect3DDevice9Ex *iface, D3DCA
      if (!caps)
          return D3DERR_INVALIDCALL;
  
@@ -80,7 +80,7 @@ index 4ac38c0e899..ea4b259bb17 100644
  
      return hr;
  }
-@@ -3580,14 +3586,20 @@ static HRESULT WINAPI d3d9_device_SetVertexShaderConstantF(IDirect3DDevice9Ex *i
+@@ -3631,14 +3637,20 @@ static HRESULT WINAPI d3d9_device_SetVertexShaderConstantF(IDirect3DDevice9Ex *i
          UINT reg_idx, const float *data, UINT count)
  {
      struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface);
@@ -103,7 +103,7 @@ index 4ac38c0e899..ea4b259bb17 100644
          return D3DERR_INVALIDCALL;
      }
  
-@@ -3603,14 +3615,21 @@ static HRESULT WINAPI d3d9_device_GetVertexShaderConstantF(IDirect3DDevice9Ex *i
+@@ -3654,14 +3666,21 @@ static HRESULT WINAPI d3d9_device_GetVertexShaderConstantF(IDirect3DDevice9Ex *i
          UINT start_idx, float *constants, UINT count)
  {
      struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface);
@@ -126,21 +126,21 @@ index 4ac38c0e899..ea4b259bb17 100644
      {
          WARN("Trying to access %u constants, but d3d9 only supports %u\n",
               start_idx + count, device->vs_uniform_count);
-@@ -4667,7 +4686,7 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine
+@@ -4718,7 +4737,7 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine
      }
  
-     wined3d_get_device_caps(wined3d_adapter, device_type, &wined3d_caps);
+     wined3d_get_device_caps(wined3d_adapter, wined3d_device_type_from_d3d(device_type), &wined3d_caps);
 -    d3d9_caps_from_wined3dcaps(parent, adapter, &caps, &wined3d_caps);
 +    d3d9_caps_from_wined3dcaps(parent, adapter, &caps, &wined3d_caps, 0);
      device->max_user_clip_planes = caps.MaxUserClipPlanes;
      device->vs_uniform_count = caps.MaxVertexShaderConst;
      if (flags & D3DCREATE_ADAPTERGROUP_DEVICE)
 diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c
-index e1561cefa1b..2293f2fd180 100644
+index b6cb25cf8ea..72e86f95f0c 100644
 --- a/dlls/d3d9/directx.c
 +++ b/dlls/d3d9/directx.c
-@@ -439,7 +439,7 @@ static HRESULT WINAPI d3d9_GetDeviceCaps(IDirect3D9Ex *iface, UINT adapter, D3DD
-     hr = wined3d_get_device_caps(wined3d_adapter, device_type, &wined3d_caps);
+@@ -450,7 +450,7 @@ static HRESULT WINAPI d3d9_GetDeviceCaps(IDirect3D9Ex *iface, UINT adapter, D3DD
+     hr = wined3d_get_device_caps(wined3d_adapter, wined3d_device_type_from_d3d(device_type), &wined3d_caps);
      wined3d_mutex_unlock();
  
 -    d3d9_caps_from_wined3dcaps(d3d9, adapter, caps, &wined3d_caps);