Module: wine Branch: master Commit: b8dc15da58aeae1d06a38b322879bedff54e6197 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8dc15da58aeae1d06a38b3228... Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 5 00:13:38 2015 +0100 d3d8: Use wined3d_resource_{map, unmap}() instead of wined3d_texture_{map, unmap}(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/surface.c | 4 ++-- dlls/d3d8/volume.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 317b2a6..679f094 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -234,7 +234,7 @@ static HRESULT WINAPI d3d8_surface_LockRect(IDirect3DSurface8 *iface, box.back = 1; } - 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(); @@ -260,7 +260,7 @@ static HRESULT WINAPI d3d8_surface_UnlockRect(IDirect3DSurface8 *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/d3d8/volume.c b/dlls/d3d8/volume.c index e37330c..f26e424 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -148,7 +148,7 @@ static HRESULT WINAPI d3d8_volume_LockBox(IDirect3DVolume8 *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 d3d8_volume_UnlockBox(IDirect3DVolume8 *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;