wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d: Use the resource's stored format in d3d12_resource_validate_box().

Browse Source 
Signed-off-by: Conor McCarthy <cmccarthy@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Conor McCarthy 2022-01-18 14:59:20 +10:00 committed by Alexandre Julliard
parent 70d87dcf37
commit 04b1c977ce
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libs/vkd3d/resource.c
View File

@ -1080,7 +1080,6 @@ static bool d3d12_resource_validate_box(const struct d3d12_resource *resource,
unsigned int sub_resource_idx, const D3D12_BOX *box) unsigned int sub_resource_idx, const D3D12_BOX *box)
{ {
unsigned int mip_level = sub_resource_idx % resource->desc.MipLevels; unsigned int mip_level = sub_resource_idx % resource->desc.MipLevels;
struct d3d12_device *device = resource->device;
const struct vkd3d_format *vkd3d_format; const struct vkd3d_format *vkd3d_format;
uint32_t width_mask, height_mask; uint32_t width_mask, height_mask;
uint64_t width, height, depth; uint64_t width, height, depth;
@ -1089,7 +1088,7 @@ static bool d3d12_resource_validate_box(const struct d3d12_resource *resource,
height = d3d12_resource_desc_get_height(&resource->desc, mip_level); height = d3d12_resource_desc_get_height(&resource->desc, mip_level);
depth = d3d12_resource_desc_get_depth(&resource->desc, mip_level); depth = d3d12_resource_desc_get_depth(&resource->desc, mip_level);
vkd3d_format = vkd3d_format_from_d3d12_resource_desc(device, &resource->desc, 0); vkd3d_format = resource->format;
assert(vkd3d_format); assert(vkd3d_format);
width_mask = vkd3d_format->block_width - 1; width_mask = vkd3d_format->block_width - 1;
height_mask = vkd3d_format->block_height - 1; height_mask = vkd3d_format->block_height - 1;