Henri Verbeet : d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_texture_cube_UnlockRect().
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Feb 26 10:26:45 CST 2016
Module: wine
Branch: master
Commit: ec590c8404e631628b5e08f9dbf064c69bc23ce2
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec590c8404e631628b5e08f9dbf064c69bc23ce2
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Thu Feb 25 19:48:36 2016 +0100
d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_texture_cube_UnlockRect().
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
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 523ad92..f9d45c5 100644
--- a/dlls/d3d9/texture.c
+++ b/dlls/d3d9/texture.c
@@ -776,7 +776,6 @@ static HRESULT WINAPI d3d9_texture_cube_UnlockRect(IDirect3DCubeTexture9 *iface,
D3DCUBEMAP_FACES face, UINT level)
{
struct d3d9_texture *texture = impl_from_IDirect3DCubeTexture9(iface);
- struct wined3d_resource *sub_resource;
struct d3d9_surface *surface_impl;
UINT sub_resource_idx;
HRESULT hr;
@@ -785,13 +784,10 @@ static HRESULT WINAPI d3d9_texture_cube_UnlockRect(IDirect3DCubeTexture9 *iface,
wined3d_mutex_lock();
sub_resource_idx = wined3d_texture_get_level_count(texture->wined3d_texture) * face + level;
- if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, sub_resource_idx)))
+ if (!(surface_impl = wined3d_texture_get_sub_resource_parent(texture->wined3d_texture, sub_resource_idx)))
hr = D3DERR_INVALIDCALL;
else
- {
- surface_impl = wined3d_resource_get_parent(sub_resource);
hr = IDirect3DSurface9_UnlockRect(&surface_impl->IDirect3DSurface9_iface);
- }
wined3d_mutex_unlock();
return hr;
More information about the wine-cvs
mailing list