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

d3d9: Avoid using a wined3d_surface in get_desc calls inside d3d9_device_StretchRect. 

Signed-off-by: Riccardo Bortolato <rikyz619@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Riccardo Bortolato 2015-10-21 15:09:45 +02:00 committed by Alexandre Julliard
parent 06fca4488c
commit 46b717c509
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/d3d9/device.c
View File

@ -1302,17 +1302,17 @@ static HRESULT WINAPI d3d9_device_StretchRect(IDirect3DDevice9Ex *iface, IDirect
struct d3d9_surface *dst = unsafe_impl_from_IDirect3DSurface9(dst_surface); struct d3d9_surface *dst = unsafe_impl_from_IDirect3DSurface9(dst_surface);
HRESULT hr = D3DERR_INVALIDCALL; HRESULT hr = D3DERR_INVALIDCALL;
struct wined3d_resource_desc src_desc, dst_desc; struct wined3d_resource_desc src_desc, dst_desc;
struct wined3d_resource *wined3d_resource; struct wined3d_resource *sub_resource;
TRACE("iface %p, src_surface %p, src_rect %p, dst_surface %p, dst_rect %p, filter %#x.\n", TRACE("iface %p, src_surface %p, src_rect %p, dst_surface %p, dst_rect %p, filter %#x.\n",
iface, src_surface, src_rect, dst_surface, dst_rect, filter); iface, src_surface, src_rect, dst_surface, dst_rect, filter);
wined3d_mutex_lock(); wined3d_mutex_lock();
wined3d_resource = wined3d_surface_get_resource(dst->wined3d_surface); sub_resource = wined3d_texture_get_sub_resource(dst->wined3d_texture, dst->sub_resource_idx);
wined3d_resource_get_desc(wined3d_resource, &dst_desc); wined3d_resource_get_desc(sub_resource, &dst_desc);
wined3d_resource = wined3d_surface_get_resource(src->wined3d_surface); sub_resource = wined3d_texture_get_sub_resource(src->wined3d_texture, src->sub_resource_idx);
wined3d_resource_get_desc(wined3d_resource, &src_desc); wined3d_resource_get_desc(sub_resource, &src_desc);
if (src_desc.usage & WINED3DUSAGE_DEPTHSTENCIL) if (src_desc.usage & WINED3DUSAGE_DEPTHSTENCIL)
{ {