From ff889f6cdc688f54e9cf9053276978edb29c4591 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 19 Sep 2015 00:59:38 +0200
Subject: [PATCH] Rebase against 60d1d6f5952e8b5d6fb0327a28c047058851fa70.

---
 .../0001-dxgi-Implement-IDXGIOutput-GetDesc.patch             | 4 ++--
 patches/patchinstall.sh                                       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/patches/dxgi-GetDesc/0001-dxgi-Implement-IDXGIOutput-GetDesc.patch b/patches/dxgi-GetDesc/0001-dxgi-Implement-IDXGIOutput-GetDesc.patch
index fd685b73..f0d03c71 100644
--- a/patches/dxgi-GetDesc/0001-dxgi-Implement-IDXGIOutput-GetDesc.patch
+++ b/patches/dxgi-GetDesc/0001-dxgi-Implement-IDXGIOutput-GetDesc.patch
@@ -28,9 +28,9 @@ index f4a5c29..158491e 100644
 +
 +    wined3d = This->adapter->parent->wined3d;
 +
-+    EnterCriticalSection(&dxgi_cs);
++    wined3d_mutex_lock();
 +    desc->Monitor = wined3d_get_adapter_monitor(wined3d, This->adapter->ordinal);
-+    LeaveCriticalSection(&dxgi_cs);
++    wined3d_mutex_unlock();
 +
 +    if (!desc->Monitor)
 +        return DXGI_ERROR_INVALID_CALL;
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 12d6243e..f9ade260 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "8fdcc239ba784894eed0f5c08ec56441db783e5e"
+	echo "60d1d6f5952e8b5d6fb0327a28c047058851fa70"
 }
 
 # Show version information