[PATCH 2/5] d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_texture_2d_LockRect().
Henri Verbeet
hverbeet at codeweavers.com
Tue Feb 23 11:21:59 CST 2016
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
---
dlls/d3d9/texture.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c
index be6fd9f..ccf85f1 100644
--- a/dlls/d3d9/texture.c
+++ b/dlls/d3d9/texture.c
@@ -340,7 +340,6 @@ static HRESULT WINAPI d3d9_texture_2d_LockRect(IDirect3DTexture9 *iface,
UINT level, D3DLOCKED_RECT *locked_rect, const RECT *rect, DWORD flags)
{
struct d3d9_texture *texture = impl_from_IDirect3DTexture9(iface);
- struct wined3d_resource *sub_resource;
struct d3d9_surface *surface_impl;
HRESULT hr;
@@ -348,13 +347,10 @@ static HRESULT WINAPI d3d9_texture_2d_LockRect(IDirect3DTexture9 *iface,
iface, level, locked_rect, rect, flags);
wined3d_mutex_lock();
- if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level)))
+ if (!(surface_impl = wined3d_texture_get_sub_resource_parent(texture->wined3d_texture, level)))
hr = D3DERR_INVALIDCALL;
else
- {
- surface_impl = wined3d_resource_get_parent(sub_resource);
hr = IDirect3DSurface9_LockRect(&surface_impl->IDirect3DSurface9_iface, locked_rect, rect, flags);
- }
wined3d_mutex_unlock();
return hr;
--
2.1.4
More information about the wine-patches
mailing list