Module: wine Branch: master Commit: 2f0a12149e1cb32fff655ba8b2dd85ebca40ffb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f0a12149e1cb32fff655ba8b2...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Wed Mar 30 21:30:18 2016 +0200
wined3d: Use the texture dimension helpers in wined3d_device_update_texture_3d().
Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/wined3d/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 395bbee..debb1d5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3547,9 +3547,9 @@ static HRESULT wined3d_device_update_texture_3d(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; }
- if (src_texture->sub_resources[src_level].resource->width != dst_texture->resource.width - || src_texture->sub_resources[src_level].resource->height != dst_texture->resource.height - || src_texture->sub_resources[src_level].resource->depth != dst_texture->resource.depth) + if (wined3d_texture_get_level_width(src_texture, src_level) != dst_texture->resource.width + || wined3d_texture_get_level_height(src_texture, src_level) != dst_texture->resource.height + || wined3d_texture_get_level_depth(src_texture, src_level) != dst_texture->resource.depth) { WARN("Source and destination dimensions do not match.\n"); return WINED3DERR_INVALIDCALL;