Rebase against upstream changes.

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

@@ -1,4 +1,4 @@
-From a7a0d0aca8b7d4b1972f237a19b5caf212a74fd3 Mon Sep 17 00:00:00 2001
+From 795be1ce7b544a08dcdf72a128a3e3d98998ba02 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.
@@ -97,7 +97,7 @@ index 205f074..3375c0f 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 9ba5906..dbbc826 100644
+index 3e3cf67..c185a93 100644
 --- a/dlls/wined3d/surface.c
 +++ b/dlls/wined3d/surface.c
 @@ -363,6 +363,7 @@ static HRESULT surface_create_dib_section(struct wined3d_surface *surface)
@@ -289,7 +289,7 @@ index 9ba5906..dbbc826 100644
  
      format = *texture->resource.format;
      if ((conversion = wined3d_format_get_color_key_conversion(texture, TRUE)))
-@@ -4353,9 +4340,9 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
+@@ -4352,9 +4339,9 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
              context_release(context);
              return E_OUTOFMEMORY;
          }
@@ -301,7 +301,7 @@ index 9ba5906..dbbc826 100644
          data.addr = mem;
      }
      else if (conversion)
-@@ -4375,14 +4362,14 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
+@@ -4374,14 +4361,14 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
          }
          if (texture->swapchain && texture->swapchain->palette)
              palette = texture->swapchain->palette;
@@ -333,7 +333,7 @@ index 6b2e266..de433f6 100644
          FIXME("Ignoring row/slice pitch (%u/%u).\n", data->row_pitch, data->slice_pitch);
  
 diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c
-index 0d13dd0..472427b 100644
+index 91325dc..4fbb6b0 100644
 --- a/dlls/wined3d/volume.c
 +++ b/dlls/wined3d/volume.c
 @@ -40,30 +40,6 @@ BOOL volume_prepare_system_memory(struct wined3d_volume *volume)
@@ -367,8 +367,8 @@ index 0d13dd0..472427b 100644
  /* Context activation is done by the caller. */
  void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wined3d_context *context,
          const struct wined3d_const_bo_address *data)
-@@ -95,7 +71,7 @@ void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wine
-         dst_row_pitch = (dst_row_pitch + alignment - 1) & ~(alignment - 1);
+@@ -93,7 +69,7 @@ void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wine
+         dst_row_pitch = width * format->conv_byte_count;
          dst_slice_pitch = dst_row_pitch * height;
  
 -        wined3d_volume_get_pitch(volume, &src_row_pitch, &src_slice_pitch);
@@ -376,7 +376,7 @@ index 0d13dd0..472427b 100644
  
          converted_mem = HeapAlloc(GetProcessHeap(), 0, dst_slice_pitch * depth);
          format->convert(data->addr, converted_mem, src_row_pitch, src_slice_pitch,
-@@ -638,7 +614,7 @@ HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume,
+@@ -636,7 +612,7 @@ HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume,
      }
      else
      {