wined3d-CSMT_{Helper,Main}: Rebase against upstream changes.

patches/wined3d-CSMT_Main/0031-wined3d-Introduce-a-function-to-retrieve-resource-me.patch

@@ -1,4 +1,4 @@
-From 97352f9938385bbf7c81995c1384633b7075076d Mon Sep 17 00:00:00 2001
+From 66f266e57766def2d64f382ba84e226b931c2a4f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Stefan=20D=C3=B6singer?= <stefan@codeweavers.com>
 Date: Mon, 16 Sep 2013 22:44:33 +0200
 Subject: wined3d: Introduce a function to retrieve resource memory.
@@ -10,10 +10,10 @@ Subject: wined3d: Introduce a function to retrieve resource memory.
  3 files changed, 38 insertions(+), 39 deletions(-)
 
 diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c
-index a7a0d44..05c5018 100644
+index 7d11fa0..9c6cf70 100644
 --- a/dlls/wined3d/resource.c
 +++ b/dlls/wined3d/resource.c
-@@ -395,6 +395,36 @@ DWORD wined3d_resource_access_from_location(DWORD location)
+@@ -432,6 +432,36 @@ DWORD wined3d_resource_access_from_location(DWORD location)
      }
  }
  
@@ -51,10 +51,10 @@ index a7a0d44..05c5018 100644
  void wined3d_resource_load_location(struct wined3d_resource *resource,
          struct wined3d_context *context, DWORD location)
 diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
-index e06a2d7..75e5acd 100644
+index d4e20767..d0c9518 100644
 --- a/dlls/wined3d/surface.c
 +++ b/dlls/wined3d/surface.c
-@@ -479,39 +479,6 @@ static HRESULT surface_create_dib_section(struct wined3d_surface *surface)
+@@ -478,39 +478,6 @@ static HRESULT surface_create_dib_section(struct wined3d_surface *surface)
      return WINED3D_OK;
  }
  
@@ -94,7 +94,7 @@ index e06a2d7..75e5acd 100644
  static void surface_prepare_buffer(struct wined3d_surface *surface)
  {
      struct wined3d_context *context;
-@@ -1328,7 +1295,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct
+@@ -1327,7 +1294,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct
          return;
      }
  
@@ -103,7 +103,7 @@ index e06a2d7..75e5acd 100644
  
      if (format->flags & WINED3DFMT_FLAG_COMPRESSED)
      {
-@@ -1694,7 +1661,7 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P
+@@ -1693,7 +1660,7 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P
          wined3d_resource_load_location(&dst_surface->resource, context, WINED3D_LOCATION_TEXTURE_RGB);
      wined3d_texture_bind(dst_surface->container, context, FALSE);
  
@@ -112,16 +112,16 @@ index e06a2d7..75e5acd 100644
      wined3d_resource_get_pitch(&src_surface->resource, &src_row_pitch, &src_slice_pitch);
  
      wined3d_surface_upload_data(dst_surface, gl_info, src_format, src_rect,
-@@ -2939,7 +2906,7 @@ static void read_from_framebuffer(struct wined3d_surface *surface,
-     BOOL srcIsUpsideDown;
+@@ -2948,7 +2915,7 @@ static void read_from_framebuffer(struct wined3d_surface *surface,
      struct wined3d_bo_address data;
+     UINT row_pitch, slice_pitch;
  
 -    surface_get_memory(surface, &data, dst_location);
 +    wined3d_resource_get_memory(&surface->resource, dst_location, &data);
  
      /* Context_release does not restore the original context in case of
       * nested context_acquire calls. Only read_from_framebuffer and
-@@ -4131,8 +4098,8 @@ static void surface_copy_simple_location(struct wined3d_surface *surface, DWORD
+@@ -4140,8 +4107,8 @@ static void surface_copy_simple_location(struct wined3d_surface *surface, DWORD
      struct wined3d_bo_address dst, src;
      UINT size = surface->resource.size;
  
@@ -132,7 +132,7 @@ index e06a2d7..75e5acd 100644
  
      if (dst.buffer_object)
      {
-@@ -4351,7 +4318,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
+@@ -4360,7 +4327,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
          surface_remove_pbo(surface, gl_info);
      }
  
@@ -142,10 +142,10 @@ index e06a2d7..75e5acd 100644
      {
          /* This code is entered for texture formats which need a fixup. */
 diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
-index 26d2d5d..d56a63b 100644
+index 23aa052..9582571 100644
 --- a/dlls/wined3d/wined3d_private.h
 +++ b/dlls/wined3d/wined3d_private.h
-@@ -2127,6 +2127,8 @@ BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource) DECLSPE
+@@ -2148,6 +2148,8 @@ BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource) DECLSPE
  void wined3d_resource_free_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN;
  BYTE *wined3d_resource_get_map_ptr(const struct wined3d_resource *resource,
          const struct wined3d_context *context, DWORD flags) DECLSPEC_HIDDEN;
@@ -155,5 +155,5 @@ index 26d2d5d..d56a63b 100644
  void wined3d_resource_invalidate_location(struct wined3d_resource *resource, DWORD location) DECLSPEC_HIDDEN;
  BOOL wined3d_resource_is_offscreen(struct wined3d_resource *resource) DECLSPEC_HIDDEN;
 -- 
-1.9.1
+2.2.2