Rebase against e06b7693d6f0980b1db2fa3b9920c7a925ceb8be.

patches/wined3d-UAV_Counters/0001-wined3d-Remaining-UAV-counter-changes.patch

@@ -1,4 +1,4 @@
-From 851cedf6dc2daff577d1f301878be82a6e5e17ce Mon Sep 17 00:00:00 2001
+From 13401363be8ff9e23972450a115b212ce3059b07 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Wed, 9 Aug 2017 06:32:43 +0200
 Subject: wined3d: Remaining UAV counter changes.
@@ -9,9 +9,9 @@ Content-Transfer-Encoding: 8bit
 Based on patches by Michael Müller and Józef Kucia.
 ---
  dlls/d3d11/device.c   | 3 +++
- dlls/wined3d/cs.c     | 4 +++-
+ dlls/wined3d/cs.c     | 2 ++
  dlls/wined3d/device.c | 6 ++++++
- 3 files changed, 12 insertions(+), 1 deletion(-)
+ 3 files changed, 11 insertions(+)
 
 diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
 index ced9a13a8ae..2ccd71d5111 100644
@@ -28,18 +28,9 @@ index ced9a13a8ae..2ccd71d5111 100644
      uav = unsafe_impl_from_ID3D11UnorderedAccessView(src_view);
  
 diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c
-index 8961dfe1467..1a9a508fc21 100644
+index 6ea2fd27a7c..fcceccb6425 100644
 --- a/dlls/wined3d/cs.c
 +++ b/dlls/wined3d/cs.c
-@@ -1319,7 +1319,7 @@ static void wined3d_cs_exec_set_unordered_access_view(struct wined3d_cs *cs, con
- 
-     device_invalidate_state(cs->device, STATE_UNORDERED_ACCESS_VIEW_BINDING(op->pipeline));
- 
--    if (op->initial_count != ~0u)
-+    if (op->view && op->initial_count != ~0u)
-         wined3d_unordered_access_view_set_counter(op->view, op->initial_count);
- }
- 
 @@ -2276,6 +2276,7 @@ static void wined3d_cs_exec_copy_uav_counter(struct wined3d_cs *cs, const void *
      context_release(context);
  
@@ -74,5 +65,5 @@ index 31955badb10..1822ee1ef37 100644
  }
  
 -- 
-2.13.1
+2.14.1