ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Validate that the source and destination dimensions match in wined3d_device_update_texture(). 

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2017-04-09 22:36:39 +02:00 committed by Alexandre Julliard
parent c68eaaa026
commit 114114f137
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/wined3d/device.c
View File

@ -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", 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); 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); context = context_acquire(device, NULL, 0);
/* Only a prepare, since we're uploading entire volumes. */ /* 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; ++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. */ /* Make sure that the destination texture is loaded. */
context = context_acquire(device, NULL, 0); context = context_acquire(device, NULL, 0);
wined3d_texture_load(dst_texture, context, FALSE); wined3d_texture_load(dst_texture, context, FALSE);