mirrors
/
vkd3d-proton
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vkd3d: Mask clear color in ClearUAVUint. 

Fixes test TODOs. Apparently Vulkan drivers can saturate here, which
caused the TODO to appear, at least on AMD Windows.

Signed-off-by: Hans-Kristian Arntzen <post@arntzen-software.no>
This commit is contained in:
Hans-Kristian Arntzen 2021-05-27 12:42:56 +02:00
parent 3c7f188863
commit fa471962dc
1 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
libs/vkd3d/command.c
View File

@ -7429,6 +7429,38 @@ static void vkd3d_clear_uav_info_from_desc(struct vkd3d_clear_uav_info *args, co
}
}
static void vkd3d_mask_uint_clear_color(uint32_t color[4], VkFormat vk_format)
{
unsigned int i;
/* Need to mask the clear value, since apparently driver can saturate the clear value instead. */
switch (vk_format)
{
case VK_FORMAT_R8_UINT:
case VK_FORMAT_R8G8_UINT:
case VK_FORMAT_R8G8B8A8_UINT:
for (i = 0; i < 4; i++)
color[i] &= 0xffu;
break;
case VK_FORMAT_R16_UINT:
case VK_FORMAT_R16G16_UINT:
case VK_FORMAT_R16G16B16A16_UINT:
for (i = 0; i < 4; i++)
color[i] &= 0xffffu;
break;
case VK_FORMAT_A2B10G10R10_UINT_PACK32:
for (i = 0; i < 3; i++)
color[i] &= 0x3ff;
color[3] &= 0x3;
break;
default:
break;
}
}
static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(d3d12_command_list_iface *iface,
D3D12_GPU_DESCRIPTOR_HANDLE gpu_handle, D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle, ID3D12Resource *resource,
const UINT values[4], UINT rect_count, const D3D12_RECT *rects)
@ -7461,6 +7493,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(d3
return;
}
vkd3d_mask_uint_clear_color(color.uint32, uint_format->vk_format);
if (d3d12_resource_is_texture(resource_impl))
{
struct vkd3d_texture_view_desc view_desc;
@ -7498,6 +7532,10 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(d3
}
}
}
else if (args.has_view)
{
vkd3d_mask_uint_clear_color(color.uint32, desc->info.view->format->vk_format);
}
d3d12_command_list_clear_uav(list, desc, resource_impl, &args, &color, rect_count, rects);
}