Rebase against 0922865b377913a27cea568ac688787a8117d8a7.

Rebasing of CSMT will need some additional work / thoughts.

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

@@ -1,4 +1,4 @@
-From 9af42367f467e87e71c6a7772bafe74fa68883bf Mon Sep 17 00:00:00 2001
+From e34f6f432826634f80cefdc9311c5472eae80dad 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.
@@ -15,10 +15,10 @@ Subject: wined3d: Merge get_pitch functions.
  8 files changed, 81 insertions(+), 81 deletions(-)
 
 diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
-index 0d2d731..27acbed 100644
+index f716cfc..da64d97 100644
 --- a/dlls/ddraw/surface.c
 +++ b/dlls/ddraw/surface.c
-@@ -6209,6 +6209,10 @@ void ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, stru
+@@ -6212,6 +6212,10 @@ void ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, stru
      DDSURFACEDESC2 *desc = &surface->surface_desc;
      struct wined3d_resource_desc wined3d_desc;
      unsigned int version = texture->version;
@@ -29,7 +29,7 @@ index 0d2d731..27acbed 100644
  
      surface->IDirectDrawSurface7_iface.lpVtbl = &ddraw_surface7_vtbl;
      surface->IDirectDrawSurface4_iface.lpVtbl = &ddraw_surface4_vtbl;
-@@ -6239,7 +6243,7 @@ void ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, stru
+@@ -6242,7 +6246,7 @@ void ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, stru
      }
  
      *desc = texture->surface_desc;
@@ -38,7 +38,7 @@ index 0d2d731..27acbed 100644
      desc->dwWidth = wined3d_desc.width;
      desc->dwHeight = wined3d_desc.height;
      surface->first_attached = surface;
-@@ -6249,14 +6253,16 @@ void ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, stru
+@@ -6252,14 +6256,16 @@ void ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, stru
          if (desc->dwFlags & DDSD_LPSURFACE)
              desc->u1.dwLinearSize = ~0u;
          else
@@ -58,10 +58,10 @@ index 0d2d731..27acbed 100644
          desc->dwFlags &= ~(DDSD_LPSURFACE | DDSD_LINEARSIZE);
      }
 diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c
-index 2bc1cc1..67d8216 100644
+index e9e586f..648882e 100644
 --- a/dlls/wined3d/resource.c
 +++ b/dlls/wined3d/resource.c
-@@ -344,3 +344,34 @@ void wined3d_resource_update_draw_binding(struct wined3d_resource *resource)
+@@ -405,3 +405,34 @@ void wined3d_resource_update_draw_binding(struct wined3d_resource *resource)
      else
          resource->draw_binding = WINED3D_LOCATION_TEXTURE_RGB;
  }
@@ -97,7 +97,7 @@ index 2bc1cc1..67d8216 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 9aec9b0..b5f286a 100644
+index 1ea8e61..5460f79 100644
 --- a/dlls/wined3d/surface.c
 +++ b/dlls/wined3d/surface.c
 @@ -364,6 +364,7 @@ static HRESULT surface_create_dib_section(struct wined3d_surface *surface)
@@ -320,10 +320,10 @@ index 9aec9b0..b5f286a 100644
      context_release(context);
  
 diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
-index c62dea4..31d282b 100644
+index 1e039e4..f4e77fb 100644
 --- a/dlls/wined3d/texture.c
 +++ b/dlls/wined3d/texture.c
-@@ -1254,7 +1254,7 @@ static void texture3d_sub_resource_upload_data(struct wined3d_resource *sub_reso
+@@ -1233,7 +1233,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;
  
@@ -333,7 +333,7 @@ index c62dea4..31d282b 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 a231081..58780ba 100644
+index 424938a..b672d4a 100644
 --- a/dlls/wined3d/volume.c
 +++ b/dlls/wined3d/volume.c
 @@ -40,30 +40,6 @@ BOOL volume_prepare_system_memory(struct wined3d_volume *volume)
@@ -344,7 +344,7 @@ index a231081..58780ba 100644
 -{
 -    const struct wined3d_format *format = volume->resource.format;
 -
--    if (volume->resource.format_flags & WINED3DFMT_FLAG_BLOCKS)
+-    if (volume->container->resource.format_flags & WINED3DFMT_FLAG_BLOCKS)
 -    {
 -        /* Since compressed formats are block based, pitch means the amount of
 -         * bytes to the next row of block rather than the next row of pixels. */
@@ -406,10 +406,10 @@ index bc1129f..fcabd53 100644
  @ cdecl wined3d_surface_get_resource(ptr)
  @ cdecl wined3d_surface_getdc(ptr ptr)
 diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
-index aabc54e..a3a0a4e 100644
+index 0f181f3..9e6cb5e 100644
 --- a/dlls/wined3d/wined3d_private.h
 +++ b/dlls/wined3d/wined3d_private.h
-@@ -2122,6 +2122,7 @@ struct wined3d_resource
+@@ -2136,6 +2136,7 @@ struct wined3d_resource
      UINT size;
      DWORD priority;
      void *heap_memory;
@@ -417,7 +417,7 @@ index aabc54e..a3a0a4e 100644
      struct list resource_list_entry;
  
      void *parent;
-@@ -2286,7 +2287,6 @@ BOOL volume_prepare_system_memory(struct wined3d_volume *volume) DECLSPEC_HIDDEN
+@@ -2300,7 +2301,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;
@@ -425,7 +425,7 @@ index aabc54e..a3a0a4e 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;
-@@ -2336,7 +2336,6 @@ struct wined3d_surface
+@@ -2350,7 +2350,6 @@ struct wined3d_surface
  
      DWORD flags;
  
@@ -434,7 +434,7 @@ index aabc54e..a3a0a4e 100644
      UINT pow2Height;
  
 diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
-index 3bb30f7..9caae2d 100644
+index a1803bb..fc91d02 100644
 --- a/include/wine/wined3d.h
 +++ b/include/wine/wined3d.h
 @@ -2427,6 +2427,8 @@ static inline HRESULT wined3d_private_store_set_private_data(struct wined3d_priv
@@ -455,5 +455,5 @@ index 3bb30f7..9caae2d 100644
          struct wined3d_surface *render_target);
  struct wined3d_resource * __cdecl wined3d_surface_get_resource(struct wined3d_surface *surface);
 -- 
-2.3.5
+2.4.2