Commit 114114f1 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard

wined3d: Validate that the source and destination dimensions match in…

wined3d: Validate that the source and destination dimensions match in wined3d_device_update_texture(). Signed-off-by: 's avatarHenri Verbeet <hverbeet@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent c68eaaa0
......@@ -3551,14 +3551,6 @@ static HRESULT wined3d_device_update_texture_3d(struct wined3d_device *device,
TRACE("device %p, src_texture %p, src_level %u, dst_texture %p, level_count %u.\n",
device, src_texture, src_level, dst_texture, level_count);
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;
}
context = context_acquire(device, NULL, 0);
/* Only a prepare, since we're uploading entire volumes. */
......@@ -3652,6 +3644,14 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device,
++src_skip_levels;
}
if (wined3d_texture_get_level_width(src_texture, src_skip_levels) != dst_texture->resource.width
|| wined3d_texture_get_level_height(src_texture, src_skip_levels) != dst_texture->resource.height
|| wined3d_texture_get_level_depth(src_texture, src_skip_levels) != dst_texture->resource.depth)
{
WARN("Source and destination dimensions do not match.\n");
return WINED3DERR_INVALIDCALL;
}
/* Make sure that the destination texture is loaded. */
context = context_acquire(device, NULL, 0);
wined3d_texture_load(dst_texture, context, FALSE);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment