Józef Kucia : d3d9: Use wined3d_resource_{map, unmap} () instead of wined3d_texture_{map, unmap}().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: b83beb18a22d0e2623dfb4148a951e21df8ce962
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b83beb18a22d0e2623dfb4148a...

Author: Józef Kucia 
Date:   Thu Nov  5 00:13:39 2015 +0100

d3d9: Use wined3d_resource_{map, unmap}() instead of wined3d_texture_{map, unmap}().

Signed-off-by: Józef Kucia 
Signed-off-by: Henri Verbeet 
Signed-off-by: Alexandre Julliard

---

dlls/d3d9/surface.c | 4 ++--
 dlls/d3d9/volume.c  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c
index 58d2309..833c1f4 100644
--- a/dlls/d3d9/surface.c
+++ b/dlls/d3d9/surface.c
@@ -251,7 +251,7 @@ static HRESULT WINAPI d3d9_surface_LockRect(IDirect3DSurface9 *iface,
     }

wined3d_mutex_lock();
-    hr = wined3d_texture_map(surface->wined3d_texture, surface->sub_resource_idx,
+    hr = wined3d_resource_map(wined3d_texture_get_resource(surface->wined3d_texture), surface->sub_resource_idx,
             &map_desc, rect ? &box : NULL, flags);
     wined3d_mutex_unlock();

@@ -272,7 +272,7 @@ static HRESULT WINAPI d3d9_surface_UnlockRect(IDirect3DSurface9 *iface)
     TRACE("iface %p.\n", iface);

wined3d_mutex_lock();
-    hr = wined3d_texture_unmap(surface->wined3d_texture, surface->sub_resource_idx);
+    hr = wined3d_resource_unmap(wined3d_texture_get_resource(surface->wined3d_texture), surface->sub_resource_idx);
     wined3d_mutex_unlock();

switch(hr)
diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c
index ca72f99..52502bf 100644
--- a/dlls/d3d9/volume.c
+++ b/dlls/d3d9/volume.c
@@ -148,7 +148,7 @@ static HRESULT WINAPI d3d9_volume_LockBox(IDirect3DVolume9 *iface,
             iface, locked_box, box, flags);

wined3d_mutex_lock();
-    hr = wined3d_texture_map(volume->wined3d_texture, volume->sub_resource_idx,
+    hr = wined3d_resource_map(wined3d_texture_get_resource(volume->wined3d_texture), volume->sub_resource_idx,
             &map_desc, (const struct wined3d_box *)box, flags);
     wined3d_mutex_unlock();

@@ -167,7 +167,7 @@ static HRESULT WINAPI d3d9_volume_UnlockBox(IDirect3DVolume9 *iface)
     TRACE("iface %p.\n", iface);

wined3d_mutex_lock();
-    hr = wined3d_texture_unmap(volume->wined3d_texture, volume->sub_resource_idx);
+    hr = wined3d_resource_unmap(wined3d_texture_get_resource(volume->wined3d_texture), volume->sub_resource_idx);
     wined3d_mutex_unlock();

return hr;