Rebase against efb1cf0299c23385f934fa9b3abc920bfca46611.

patches/wined3d-CSMT_Main/0137-wined3d-Clean-up-volume-resource-data-through-the-CS.patch

@@ -1,4 +1,4 @@
-From baa69b6a987dfdefff4b205f1dabe6e485226256 Mon Sep 17 00:00:00 2001
+From e092a5748fac188f5b214467cdb33b4df9a7163c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Stefan=20D=C3=B6singer?= <stefan@codeweavers.com>
 Date: Wed, 2 Oct 2013 22:54:57 +0200
 Subject: wined3d: Clean up volume resource data through the CS.
@@ -10,10 +10,10 @@ Subject: wined3d: Clean up volume resource data through the CS.
  3 files changed, 36 insertions(+), 3 deletions(-)
 
 diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c
-index 40cd85d..9cba57b 100644
+index 54b6d1a..18b556d 100644
 --- a/dlls/wined3d/cs.c
 +++ b/dlls/wined3d/cs.c
-@@ -84,6 +84,7 @@ enum wined3d_cs_op
+@@ -85,6 +85,7 @@ enum wined3d_cs_op
      WINED3D_CS_OP_CREATE_VBO,
      WINED3D_CS_OP_RESOURCE_CLEANUP,
      WINED3D_CS_OP_BUFFER_CLEANUP,
@@ -21,7 +21,7 @@ index 40cd85d..9cba57b 100644
      WINED3D_CS_OP_STOP,
  };
  
-@@ -491,6 +492,12 @@ struct wined3d_cs_buffer_cleanup
+@@ -501,6 +502,12 @@ struct wined3d_cs_buffer_cleanup
      struct wined3d_buffer *buffer;
  };
  
@@ -34,7 +34,7 @@ index 40cd85d..9cba57b 100644
  static void wined3d_cs_mt_submit(struct wined3d_cs *cs, size_t size)
  {
      LONG new_val = (cs->queue.head + size) & (WINED3D_CS_QUEUE_SIZE - 1);
-@@ -2392,6 +2399,26 @@ void wined3d_cs_emit_buffer_cleanup(struct wined3d_cs *cs, struct wined3d_buffer
+@@ -2506,6 +2513,26 @@ void wined3d_cs_emit_buffer_cleanup(struct wined3d_cs *cs, struct wined3d_buffer
      cs->ops->submit(cs, sizeof(*op));
  }
  
@@ -61,7 +61,7 @@ index 40cd85d..9cba57b 100644
  static UINT (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) =
  {
      /* WINED3D_CS_OP_NOP                        */ wined3d_cs_exec_nop,
-@@ -2454,6 +2481,7 @@ static UINT (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void
+@@ -2569,6 +2596,7 @@ static UINT (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void
      /* WINED3D_CS_OP_CREATE_VBO                 */ wined3d_cs_exec_create_vbo,
      /* WINED3D_CS_OP_RESOURCE_CLEANUP           */ wined3d_cs_exec_resource_cleanup,
      /* WINED3D_CS_OP_BUFFER_CLEANUP             */ wined3d_cs_exec_buffer_cleanup,
@@ -70,10 +70,10 @@ index 40cd85d..9cba57b 100644
  
  static inline void *_wined3d_cs_mt_require_space(struct wined3d_cs *cs, size_t size, BOOL prio)
 diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c
-index a223f43..fb7ec1a 100644
+index 7913a13..36dd640 100644
 --- a/dlls/wined3d/volume.c
 +++ b/dlls/wined3d/volume.c
-@@ -296,10 +296,8 @@ void wined3d_volume_destroy(struct wined3d_volume *volume)
+@@ -313,10 +313,8 @@ void wined3d_volume_destroy(struct wined3d_volume *volume)
      TRACE("volume %p.\n", volume);
  
      resource_cleanup(&volume->resource);
@@ -85,7 +85,7 @@ index a223f43..fb7ec1a 100644
  }
  
  static void volume_unload(struct wined3d_resource *resource)
-@@ -340,6 +338,11 @@ ULONG CDECL wined3d_volume_incref(struct wined3d_volume *volume)
+@@ -357,6 +355,11 @@ static ULONG CDECL wined3d_volume_incref(struct wined3d_volume *volume)
      return wined3d_texture_incref(volume->container);
  }
  
@@ -94,14 +94,14 @@ index a223f43..fb7ec1a 100644
 +    HeapFree(GetProcessHeap(), 0, volume);
 +}
 +
- ULONG CDECL wined3d_volume_decref(struct wined3d_volume *volume)
+ static ULONG CDECL wined3d_volume_decref(struct wined3d_volume *volume)
  {
      TRACE("Forwarding to container %p.\n", volume->container);
 diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
-index ffcdcb4..8537000 100644
+index 0933ae6..088bf72 100644
 --- a/dlls/wined3d/wined3d_private.h
 +++ b/dlls/wined3d/wined3d_private.h
-@@ -2358,6 +2358,7 @@ void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context *
+@@ -2423,6 +2423,7 @@ void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context *
          BOOL srgb_mode) DECLSPEC_HIDDEN;
  void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wined3d_context *context,
          const struct wined3d_const_bo_address *data) DECLSPEC_HIDDEN;
@@ -109,7 +109,7 @@ index ffcdcb4..8537000 100644
  
  struct wined3d_surface_dib
  {
-@@ -2728,6 +2729,7 @@ void wined3d_cs_emit_create_vbo(struct wined3d_cs *cs, struct wined3d_buffer *bu
+@@ -2797,6 +2798,7 @@ void wined3d_cs_emit_create_vbo(struct wined3d_cs *cs, struct wined3d_buffer *bu
  void wined3d_cs_emit_resource_cleanup(struct wined3d_cs *cs,
          struct wined3d_resource *resource) DECLSPEC_HIDDEN;
  void wined3d_cs_emit_buffer_cleanup(struct wined3d_cs *cs, struct wined3d_buffer *buffer) DECLSPEC_HIDDEN;
@@ -118,5 +118,5 @@ index ffcdcb4..8537000 100644
  /* Direct3D terminology with little modifications. We do not have an issued state
   * because only the driver knows about it, but we have a created state because d3d
 -- 
-1.9.1
+2.5.1