Rebase against f0053d06c4fc168360da638fa26f1927fe975262.

patches/Pipelight/0003-wined3d-allow-changing-strict-drawing-through-an-exp.patch

@@ -1,4 +1,4 @@
-From 166196873b1b6149e6f026abefef31b17e087cf4 Mon Sep 17 00:00:00 2001
+From fa15751fb4c91885360b81474abf16b5a4b93a99 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 20 Jul 2014 22:22:14 +0200
 Subject: wined3d: allow changing strict drawing through an exported function
@@ -9,7 +9,7 @@ Subject: wined3d: allow changing strict drawing through an exported function
  2 files changed, 7 insertions(+)
 
 diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
-index 53eb97a..57500f2 100644
+index d31cf9a..dd2def2 100644
 --- a/dlls/wined3d/wined3d.spec
 +++ b/dlls/wined3d/wined3d.spec
 @@ -222,6 +222,8 @@
@@ -20,7 +20,7 @@ index 53eb97a..57500f2 100644
 +
  @ cdecl wined3d_surface_get_parent(ptr)
  @ cdecl wined3d_surface_get_pitch(ptr)
- @ cdecl wined3d_surface_update_overlay_z_order(ptr long ptr)
+ 
 diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c
 index 0543d97..78cc3a2 100644
 --- a/dlls/wined3d/wined3d_main.c

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "02008a6f2e373ba4ff06deb8ca124ecd65b57227"
+	echo "f0053d06c4fc168360da638fa26f1927fe975262"
 }
 
 # Show version information

patches/wined3d-CSMT_Main/0001-wined3d-Merge-get_pitch-functions.patch

@@ -1,4 +1,4 @@
-From 9ac5eaa0e224fa33ef7afc9520d54262de9e506d Mon Sep 17 00:00:00 2001
+From 0121313746277d4ade36ddf19f616fbbb481304e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Stefan=20D=C3=B6singer?= <stefan@codeweavers.com>
 Date: Thu, 19 Sep 2013 14:22:24 +0200
 Subject: wined3d: Merge get_pitch functions.
@@ -51,7 +51,7 @@ index 44cdb43..ed598cc 100644
 +    TRACE("Returning row pitch %u, slice pitch %u.\n", *row_pitch, *slice_pitch);
 +}
 diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
-index b14d0a3..df9b855 100644
+index 65cb3b7..293b78d 100644
 --- a/dlls/wined3d/surface.c
 +++ b/dlls/wined3d/surface.c
 @@ -364,6 +364,7 @@ HRESULT surface_create_dib_section(struct wined3d_surface *surface)
@@ -157,8 +157,8 @@ index b14d0a3..df9b855 100644
 +    return row_pitch;
  }
  
- HRESULT CDECL wined3d_surface_update_overlay_z_order(struct wined3d_surface *surface,
-@@ -2020,20 +2011,21 @@ HRESULT wined3d_surface_update_desc(struct wined3d_surface *surface,
+ HRESULT wined3d_surface_update_desc(struct wined3d_surface *surface,
+@@ -1959,20 +1950,21 @@ HRESULT wined3d_surface_update_desc(struct wined3d_surface *surface,
          surface->resource.map_binding = WINED3D_LOCATION_USER_MEMORY;
          valid_location = WINED3D_LOCATION_USER_MEMORY;
      }
@@ -184,7 +184,7 @@ index b14d0a3..df9b855 100644
      }
  
      /* The format might be changed to a format that needs conversion.
-@@ -2655,7 +2647,7 @@ HRESULT wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_
+@@ -2594,7 +2586,7 @@ HRESULT wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_
      if (fmt_flags & WINED3DFMT_FLAG_BROKEN_PITCH)
          map_desc->row_pitch = surface->resource.width * format->byte_count;
      else
@@ -193,7 +193,7 @@ index b14d0a3..df9b855 100644
      map_desc->slice_pitch = surface->resource.height * map_desc->row_pitch;
  
      if (!box)
-@@ -2706,6 +2698,7 @@ static void read_from_framebuffer(struct wined3d_surface *surface,
+@@ -2645,6 +2637,7 @@ static void read_from_framebuffer(struct wined3d_surface *surface,
      int i;
      BOOL srcIsUpsideDown;
      struct wined3d_bo_address data;
@@ -201,7 +201,7 @@ index b14d0a3..df9b855 100644
  
      surface_get_memory(surface, &data, dst_location);
  
-@@ -2747,8 +2740,8 @@ static void read_from_framebuffer(struct wined3d_surface *surface,
+@@ -2686,8 +2679,8 @@ static void read_from_framebuffer(struct wined3d_surface *surface,
      }
  
      /* Setup pixel store pack state -- to glReadPixels into the correct place */
@@ -212,7 +212,7 @@ index b14d0a3..df9b855 100644
      checkGLcall("glPixelStorei");
  
      gl_info->gl_ops.gl.p_glReadPixels(0, 0,
-@@ -2765,8 +2758,6 @@ static void read_from_framebuffer(struct wined3d_surface *surface,
+@@ -2704,8 +2697,6 @@ static void read_from_framebuffer(struct wined3d_surface *surface,
      {
          /* glReadPixels returns the image upside down, and there is no way to prevent this.
           * Flip the lines in software. */
@@ -221,7 +221,7 @@ index b14d0a3..df9b855 100644
          if (!(row = HeapAlloc(GetProcessHeap(), 0, pitch)))
              goto error;
  
-@@ -3920,7 +3911,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
+@@ -3859,7 +3850,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
      struct wined3d_device *device = surface->resource.device;
      const struct wined3d_color_key_conversion *conversion;
      struct wined3d_texture *texture = surface->container;
@@ -230,7 +230,7 @@ index b14d0a3..df9b855 100644
      struct wined3d_bo_address data;
      struct wined3d_format format;
      POINT dst_point = {0, 0};
-@@ -4005,7 +3996,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
+@@ -3944,7 +3935,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
      wined3d_texture_bind_and_dirtify(texture, context, srgb);
  
      width = surface->resource.width;
@@ -239,7 +239,7 @@ index b14d0a3..df9b855 100644
  
      format = *texture->resource.format;
      if ((conversion = wined3d_format_get_color_key_conversion(texture, TRUE)))
-@@ -4043,9 +4034,9 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
+@@ -3982,9 +3973,9 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
              context_release(context);
              return E_OUTOFMEMORY;
          }
@@ -251,7 +251,7 @@ index b14d0a3..df9b855 100644
          data.addr = mem;
      }
      else if (conversion)
-@@ -4065,14 +4056,14 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
+@@ -4004,14 +3995,14 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
          }
          if (texture->swapchain && texture->swapchain->palette)
              palette = texture->swapchain->palette;
@@ -270,10 +270,10 @@ index b14d0a3..df9b855 100644
      HeapFree(GetProcessHeap(), 0, mem);
  
 diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
-index 297ab27..6daf572 100644
+index 0c48c91..8646e82 100644
 --- a/dlls/wined3d/texture.c
 +++ b/dlls/wined3d/texture.c
-@@ -1142,7 +1142,7 @@ static void texture3d_sub_resource_upload_data(struct wined3d_resource *sub_reso
+@@ -1141,7 +1141,7 @@ static void texture3d_sub_resource_upload_data(struct wined3d_resource *sub_reso
      struct wined3d_const_bo_address addr;
      unsigned int row_pitch, slice_pitch;
  
@@ -336,10 +336,10 @@ index 3ac7f98..9235f3f 100644
  
      if (!box)
 diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
-index 1f29257..865f476 100644
+index 8b2cdb2..a0b7681 100644
 --- a/dlls/wined3d/wined3d_private.h
 +++ b/dlls/wined3d/wined3d_private.h
-@@ -2275,6 +2275,7 @@ struct wined3d_resource
+@@ -2276,6 +2276,7 @@ struct wined3d_resource
      UINT size;
      DWORD priority;
      void *heap_memory;
@@ -347,7 +347,7 @@ index 1f29257..865f476 100644
      struct list resource_list_entry;
  
      void *parent;
-@@ -2302,6 +2303,8 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device *
+@@ -2303,6 +2304,8 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device *
  void resource_unload(struct wined3d_resource *resource) DECLSPEC_HIDDEN;
  BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN;
  void wined3d_resource_free_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN;
@@ -356,7 +356,7 @@ index 1f29257..865f476 100644
  GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN;
  GLenum wined3d_resource_gl_legacy_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN;
  BOOL wined3d_resource_is_offscreen(struct wined3d_resource *resource) DECLSPEC_HIDDEN;
-@@ -2437,7 +2440,6 @@ BOOL volume_prepare_system_memory(struct wined3d_volume *volume) DECLSPEC_HIDDEN
+@@ -2438,7 +2441,6 @@ BOOL volume_prepare_system_memory(struct wined3d_volume *volume) DECLSPEC_HIDDEN
  HRESULT wined3d_volume_create(struct wined3d_texture *container, const struct wined3d_resource_desc *desc,
          unsigned int level, struct wined3d_volume **volume) DECLSPEC_HIDDEN;
  void wined3d_volume_destroy(struct wined3d_volume *volume) DECLSPEC_HIDDEN;
@@ -364,7 +364,7 @@ index 1f29257..865f476 100644
  void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context *context,
          BOOL srgb_mode) DECLSPEC_HIDDEN;
  void wined3d_volume_invalidate_location(struct wined3d_volume *volume, DWORD location) DECLSPEC_HIDDEN;
-@@ -2490,7 +2492,6 @@ struct wined3d_surface
+@@ -2491,7 +2493,6 @@ struct wined3d_surface
  
      DWORD flags;