Henri Verbeet : d3d8: Use wined3d_texture_get_sub_resource_parent() in d3d8_texture_2d_UnlockRect().
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Feb 18 10:14:55 CST 2016
Module: wine
Branch: master
Commit: 4394c3b8033ed0a28188ca0cd68d6a52c210d4df
URL: http://source.winehq.org/git/wine.git/?a=commit;h=4394c3b8033ed0a28188ca0cd68d6a52c210d4df
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Wed Feb 17 18:35:33 2016 +0100
d3d8: Use wined3d_texture_get_sub_resource_parent() in d3d8_texture_2d_UnlockRect().
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3d8/texture.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c
index f3fcd4e..c4b986d 100644
--- a/dlls/d3d8/texture.c
+++ b/dlls/d3d8/texture.c
@@ -317,20 +317,16 @@ static HRESULT WINAPI d3d8_texture_2d_LockRect(IDirect3DTexture8 *iface, UINT le
static HRESULT WINAPI d3d8_texture_2d_UnlockRect(IDirect3DTexture8 *iface, UINT level)
{
struct d3d8_texture *texture = impl_from_IDirect3DTexture8(iface);
- struct wined3d_resource *sub_resource;
struct d3d8_surface *surface_impl;
HRESULT hr;
TRACE("iface %p, level %u.\n", iface, level);
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 = IDirect3DSurface8_UnlockRect(&surface_impl->IDirect3DSurface8_iface);
- }
wined3d_mutex_unlock();
return hr;
More information about the wine-cvs
mailing list