Rebase against a96abff8082d3c6ac7f1acb57727656a94a6bde9.

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

@@ -1,4 +1,4 @@
-From 42b6ba4bb832d0191cda985e2701c61626c103b6 Mon Sep 17 00:00:00 2001
+From 1ad9f7310d40524027fbb81d998bf8eb1a5dd067 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 882491c..e10ba41 100644
+index 2ad66de..362da3d 100644
 --- a/dlls/wined3d/resource.c
 +++ b/dlls/wined3d/resource.c
-@@ -223,7 +223,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device *
+@@ -233,7 +233,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device *
      return WINED3D_OK;
  }
  
@@ -23,10 +23,10 @@ index 882491c..e10ba41 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 273da13..8ae36af 100644
+index 91f1229..83c5ad4 100644
 --- a/dlls/wined3d/surface.c
 +++ b/dlls/wined3d/surface.c
-@@ -958,16 +958,6 @@ static HRESULT wined3d_surface_depth_blt(struct wined3d_surface *src_surface, DW
+@@ -939,16 +939,6 @@ static HRESULT wined3d_surface_depth_blt(struct wined3d_surface *src_surface, DW
      return WINED3D_OK;
  }
  
@@ -42,8 +42,8 @@ index 273da13..8ae36af 100644
 -
  static ULONG surface_resource_incref(struct wined3d_resource *resource)
  {
-     return wined3d_surface_incref(surface_from_resource(resource));
-@@ -1013,10 +1003,6 @@ static void surface_unload(struct wined3d_resource *resource)
+     struct wined3d_surface *surface = surface_from_resource(resource);
+@@ -996,10 +986,6 @@ static void surface_unload(struct wined3d_resource *resource)
          wined3d_resource_invalidate_location(&surface->resource, ~surface->resource.map_binding);
      }
  
@@ -54,7 +54,7 @@ index 273da13..8ae36af 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
-@@ -3949,7 +3935,8 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
+@@ -3918,7 +3904,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 273da13..8ae36af 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 4fd8b62..50fc36b 100644
+index 8864b3b..9813d84 100644
 --- a/dlls/wined3d/wined3d_private.h
 +++ b/dlls/wined3d/wined3d_private.h
-@@ -2216,6 +2216,7 @@ DWORD wined3d_resource_access_from_location(DWORD location) DECLSPEC_HIDDEN;
+@@ -2261,6 +2261,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 4fd8b62..50fc36b 100644
  BYTE *wined3d_resource_get_map_ptr(const struct wined3d_resource *resource,
          const struct wined3d_context *context, DWORD flags) DECLSPEC_HIDDEN;
 -- 
-2.6.1
+2.7.0