From 51dc575ef304cf9f3ef2864f01be0fcdfcbb08b7 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Thu, 18 May 2017 05:32:56 +0200
Subject: [PATCH] Rebase against 9baceabb88e2aeb90a32bb5f6923107904ed58ea.

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

diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index ff4108ea..fc5b92cb 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "66c7b37a9819195d40f5ab053268548c4370fb06"
+	echo "9baceabb88e2aeb90a32bb5f6923107904ed58ea"
 }
 
 # Show version information
diff --git a/patches/wined3d-CSMT_Main/9999-IfDefined.patch b/patches/wined3d-CSMT_Main/9999-IfDefined.patch
index 1a979783..d5972abf 100644
--- a/patches/wined3d-CSMT_Main/9999-IfDefined.patch
+++ b/patches/wined3d-CSMT_Main/9999-IfDefined.patch
@@ -1360,7 +1360,7 @@ diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c
 diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
 --- a/dlls/wined3d/wined3d_private.h
 +++ b/dlls/wined3d/wined3d_private.h
-@@ -2666,6 +2666,16 @@ struct wined3d_state
+@@ -2667,6 +2667,16 @@ struct wined3d_state
      struct wined3d_rasterizer_state *rasterizer_state;
  };
  
@@ -1377,7 +1377,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
  #define WINED3D_UNMAPPED_STAGE ~0u
  
  /* Multithreaded flag. Removed from the public header to signal that
-@@ -2777,6 +2787,12 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL
+@@ -2778,6 +2788,12 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL
  void device_resource_add(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN;
  void device_resource_released(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN;
  void device_invalidate_state(const struct wined3d_device *device, DWORD state) DECLSPEC_HIDDEN;
@@ -1390,7 +1390,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
  
  static inline BOOL isStateDirty(const struct wined3d_context *context, DWORD state)
  {
-@@ -2963,7 +2979,11 @@ struct wined3d_texture
+@@ -2964,7 +2980,11 @@ struct wined3d_texture
  
          unsigned int map_count;
          DWORD locations;
@@ -1402,7 +1402,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
      } sub_resources[1];
  };
  
-@@ -3271,7 +3291,12 @@ struct wined3d_cs_queue
+@@ -3272,7 +3292,12 @@ struct wined3d_cs_queue
  
  struct wined3d_cs_ops
  {
@@ -1415,7 +1415,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
      void (*submit)(struct wined3d_cs *cs);
      void (*finish)(struct wined3d_cs *cs);
      void (*push_constants)(struct wined3d_cs *cs, enum wined3d_push_constants p,
-@@ -3288,7 +3313,13 @@ struct wined3d_cs
+@@ -3289,7 +3314,13 @@ struct wined3d_cs
      HANDLE thread;
      DWORD thread_id;
  
@@ -1429,7 +1429,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
      size_t data_size, start, end;
      void *data;
      struct list query_poll_list;
-@@ -3371,6 +3402,9 @@ void wined3d_cs_emit_set_unordered_access_view(struct wined3d_cs *cs, enum wined
+@@ -3372,6 +3403,9 @@ void wined3d_cs_emit_set_unordered_access_view(struct wined3d_cs *cs, enum wined
  void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs,
          struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN;
  void wined3d_cs_emit_set_viewport(struct wined3d_cs *cs, const struct wined3d_viewport *viewport) DECLSPEC_HIDDEN;