Rebase against 99033b14534ffe8ff6c88c8d38a70d398c933b4d.

patches/wined3d-CSMT_Helper/0001-wined3d-Rename-wined3d_resource_-un-map-to-wined3d_r.patch

@@ -0,0 +1,97 @@
+From d28eecc1251b483848ae2bf539ca5398c8575946 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Wed, 4 Nov 2015 19:31:30 +0100
+Subject: wined3d: Rename wined3d_resource_(un)map to
+ wined3d_resource_sub_resource_(un)map.
+
+To avoid name conflicts in the CSMT patchset.
+---
+ dlls/d3d11/device.c       | 4 ++--
+ dlls/wined3d/resource.c   | 4 ++--
+ dlls/wined3d/wined3d.spec | 4 ++--
+ include/wine/wined3d.h    | 6 +++---
+ 4 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
+index ca8b0ef..f5acbff 100644
+--- a/dlls/d3d11/device.c
++++ b/dlls/d3d11/device.c
+@@ -215,7 +215,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_Map(ID3D11DeviceContext
+     wined3d_resource = wined3d_resource_from_d3d11_resource(resource);
+ 
+     wined3d_mutex_lock();
+-    hr = wined3d_resource_map(wined3d_resource, subresource_idx,
++    hr = wined3d_resource_sub_resource_map(wined3d_resource, subresource_idx,
+             &map_desc, NULL, wined3d_map_flags_from_d3d11_map_type(map_type));
+     wined3d_mutex_unlock();
+ 
+@@ -236,7 +236,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_Unmap(ID3D11DeviceContext
+     wined3d_resource = wined3d_resource_from_d3d11_resource(resource);
+ 
+     wined3d_mutex_lock();
+-    wined3d_resource_unmap(wined3d_resource, subresource_idx);
++    wined3d_resource_sub_resource_unmap(wined3d_resource, subresource_idx);
+     wined3d_mutex_unlock();
+ }
+ 
+diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c
+index d466764..74be48d 100644
+--- a/dlls/wined3d/resource.c
++++ b/dlls/wined3d/resource.c
+@@ -295,7 +295,7 @@ void CDECL wined3d_resource_get_desc(const struct wined3d_resource *resource, st
+     desc->size = resource->size;
+ }
+ 
+-HRESULT CDECL wined3d_resource_map(struct wined3d_resource *resource, unsigned int sub_resource_idx,
++HRESULT CDECL wined3d_resource_sub_resource_map(struct wined3d_resource *resource, unsigned int sub_resource_idx,
+         struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags)
+ {
+     TRACE("resource %p, sub_resource_idx %u, map_desc %p, box %p, flags %#x.\n",
+@@ -304,7 +304,7 @@ HRESULT CDECL wined3d_resource_map(struct wined3d_resource *resource, unsigned i
+     return resource->resource_ops->resource_sub_resource_map(resource, sub_resource_idx, map_desc, box, flags);
+ }
+ 
+-HRESULT CDECL wined3d_resource_unmap(struct wined3d_resource *resource, unsigned int sub_resource_idx)
++HRESULT CDECL wined3d_resource_sub_resource_unmap(struct wined3d_resource *resource, unsigned int sub_resource_idx)
+ {
+     TRACE("resource %p, sub_resource_idx %u.\n", resource, sub_resource_idx);
+ 
+diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
+index 7067e08..7c4ea7c 100644
+--- a/dlls/wined3d/wined3d.spec
++++ b/dlls/wined3d/wined3d.spec
+@@ -182,10 +182,10 @@
+ @ cdecl wined3d_resource_get_desc(ptr ptr)
+ @ cdecl wined3d_resource_get_parent(ptr)
+ @ cdecl wined3d_resource_get_priority(ptr)
+-@ cdecl wined3d_resource_map(ptr long ptr ptr long)
+ @ cdecl wined3d_resource_set_parent(ptr ptr)
+ @ cdecl wined3d_resource_set_priority(ptr long)
+-@ cdecl wined3d_resource_unmap(ptr long)
++@ cdecl wined3d_resource_sub_resource_map(ptr long ptr ptr long)
++@ cdecl wined3d_resource_sub_resource_unmap(ptr long)
+ 
+ @ cdecl wined3d_rendertarget_view_create(ptr ptr ptr ptr ptr)
+ @ cdecl wined3d_rendertarget_view_create_from_surface(ptr ptr ptr ptr)
+diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
+index 9c9258a..d859b6f 100644
+--- a/include/wine/wined3d.h
++++ b/include/wine/wined3d.h
+@@ -2422,11 +2422,11 @@ void __cdecl wined3d_resource_get_desc(const struct wined3d_resource *resource,
+         struct wined3d_resource_desc *desc);
+ void * __cdecl wined3d_resource_get_parent(const struct wined3d_resource *resource);
+ DWORD __cdecl wined3d_resource_get_priority(const struct wined3d_resource *resource);
+-HRESULT __cdecl wined3d_resource_map(struct wined3d_resource *resource, unsigned int sub_resource_idx,
+-        struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags);
+ void __cdecl wined3d_resource_set_parent(struct wined3d_resource *resource, void *parent);
+ DWORD __cdecl wined3d_resource_set_priority(struct wined3d_resource *resource, DWORD priority);
+-HRESULT __cdecl wined3d_resource_unmap(struct wined3d_resource *resource, unsigned int sub_resource_idx);
++HRESULT __cdecl wined3d_resource_sub_resource_map(struct wined3d_resource *resource, unsigned int sub_resource_idx,
++        struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags);
++HRESULT __cdecl wined3d_resource_sub_resource_unmap(struct wined3d_resource *resource, unsigned int sub_resource_idx);
+ 
+ HRESULT __cdecl wined3d_rendertarget_view_create(const struct wined3d_rendertarget_view_desc *desc,
+         struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops,
+-- 
+2.6.2
+