ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia 2015-11-05 00:13:39 +01:00 committed by Alexandre Julliard
parent b8dc15da58
commit b83beb18a2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/d3d9/surface.c
View File

@ -251,7 +251,7 @@ static HRESULT WINAPI d3d9_surface_LockRect(IDirect3DSurface9 *iface,
} }
wined3d_mutex_lock(); 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); &map_desc, rect ? &box : NULL, flags);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
@ -272,7 +272,7 @@ static HRESULT WINAPI d3d9_surface_UnlockRect(IDirect3DSurface9 *iface)
TRACE("iface %p.\n", iface); TRACE("iface %p.\n", iface);
wined3d_mutex_lock(); 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(); wined3d_mutex_unlock();
switch(hr) switch(hr)

4
dlls/d3d9/volume.c
View File

@ -148,7 +148,7 @@ static HRESULT WINAPI d3d9_volume_LockBox(IDirect3DVolume9 *iface,
iface, locked_box, box, flags); iface, locked_box, box, flags);
wined3d_mutex_lock(); 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); &map_desc, (const struct wined3d_box *)box, flags);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
@ -167,7 +167,7 @@ static HRESULT WINAPI d3d9_volume_UnlockBox(IDirect3DVolume9 *iface)
TRACE("iface %p.\n", iface); TRACE("iface %p.\n", iface);
wined3d_mutex_lock(); 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(); wined3d_mutex_unlock();
return hr; return hr;