Rebase against f8d78b0d927c1cae4c5075c64d980c306fb3ed87.

patches/wined3d-CSMT_Main/0031-wined3d-Use-resource-facilities-to-destroy-PBOs.patch

@@ -1,4 +1,4 @@
-From a0d7057a64862170f97d4c99d15d58323681efe4 Mon Sep 17 00:00:00 2001
+From 42b6ba4bb832d0191cda985e2701c61626c103b6 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Stefan=20D=C3=B6singer?= <stefan@codeweavers.com>
 Date: Tue, 21 Jan 2014 16:49:21 +0100
 Subject: wined3d: Use resource facilities to destroy PBOs.
@@ -10,10 +10,10 @@ Subject: wined3d: Use resource facilities to destroy PBOs.
  3 files changed, 4 insertions(+), 16 deletions(-)
 
 diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c
-index c6b3945..9783b78 100644
+index 882491c..e10ba41 100644
 --- a/dlls/wined3d/resource.c
 +++ b/dlls/wined3d/resource.c
-@@ -142,7 +142,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device *
+@@ -223,7 +223,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device *
      return WINED3D_OK;
  }
  
@@ -23,11 +23,11 @@ index c6b3945..9783b78 100644
      struct wined3d_context *context = context_acquire(resource->device, NULL);
      const struct wined3d_gl_info *gl_info = context->gl_info;
 diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
-index e5edd34..b197655 100644
+index 273da13..8ae36af 100644
 --- a/dlls/wined3d/surface.c
 +++ b/dlls/wined3d/surface.c
-@@ -1029,16 +1029,6 @@ HRESULT CDECL wined3d_surface_get_render_target_data(struct wined3d_surface *sur
-     return wined3d_surface_blt(surface, NULL, render_target, NULL, 0, NULL, WINED3D_TEXF_POINT);
+@@ -958,16 +958,6 @@ static HRESULT wined3d_surface_depth_blt(struct wined3d_surface *src_surface, DW
+     return WINED3D_OK;
  }
  
 -/* Context activation is done by the caller. */
@@ -43,7 +43,7 @@ index e5edd34..b197655 100644
  static ULONG surface_resource_incref(struct wined3d_resource *resource)
  {
      return wined3d_surface_incref(surface_from_resource(resource));
-@@ -1084,10 +1074,6 @@ static void surface_unload(struct wined3d_resource *resource)
+@@ -1013,10 +1003,6 @@ static void surface_unload(struct wined3d_resource *resource)
          wined3d_resource_invalidate_location(&surface->resource, ~surface->resource.map_binding);
      }
  
@@ -54,7 +54,7 @@ index e5edd34..b197655 100644
      /* Destroy fbo render buffers. This is needed for implicit render targets, for
       * all application-created targets the application has to release the surface
       * before calling _Reset
-@@ -4225,7 +4211,8 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
+@@ -3949,7 +3935,8 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
  
          wined3d_resource_prepare_map_memory(&surface->resource, context);
          wined3d_resource_load_location(&surface->resource, context, surface->resource.map_binding);
@@ -65,10 +65,10 @@ index e5edd34..b197655 100644
  
      wined3d_resource_get_memory(&surface->resource, surface->resource.locations, &data);
 diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
-index beaf9bc..5e6d5d3 100644
+index 4fd8b62..50fc36b 100644
 --- a/dlls/wined3d/wined3d_private.h
 +++ b/dlls/wined3d/wined3d_private.h
-@@ -2126,6 +2126,7 @@ DWORD wined3d_resource_access_from_location(DWORD location) DECLSPEC_HIDDEN;
+@@ -2216,6 +2216,7 @@ DWORD wined3d_resource_access_from_location(DWORD location) DECLSPEC_HIDDEN;
  BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN;
  BOOL wined3d_resource_check_block_align(const struct wined3d_resource *resource,
          const struct wined3d_box *box) DECLSPEC_HIDDEN;
@@ -77,5 +77,5 @@ index beaf9bc..5e6d5d3 100644
  BYTE *wined3d_resource_get_map_ptr(const struct wined3d_resource *resource,
          const struct wined3d_context *context, DWORD flags) DECLSPEC_HIDDEN;
 -- 
-2.2.1
+2.6.1