system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 01:34:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

wined3d: Handle structured buffers in wined3d_unordered_access_view_vk_clear().

Browse source 
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2022-01-24 20:20:38 -06:00 committed by Alexandre Julliard
parent ba9737ba82
commit ff94b838fd
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dlls/d3d11/tests/d3d11.c
View file

@ -16290,10 +16290,8 @@ static void test_clear_buffer_unordered_access_view(void)
buffer_desc.Usage = D3D11_USAGE_DEFAULT;
buffer_desc.BindFlags = D3D11_BIND_UNORDERED_ACCESS;
buffer_desc.CPUAccessFlags = 0;
buffer_desc.MiscFlags = 0;
buffer_desc.StructureByteStride = 0;
buffer_desc.MiscFlags = D3D11_RESOURCE_MISC_BUFFER_STRUCTURED;
buffer_desc.StructureByteStride = 4;
buffer_desc.StructureByteStride = 8;
hr = ID3D11Device_CreateBuffer(device, &buffer_desc, NULL, &buffer);
ok(hr == S_OK, "Failed to create a buffer, hr %#x.\n", hr);
@ -16319,9 +16317,10 @@ static void test_clear_buffer_unordered_access_view(void)
ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav2, &fe_uvec4.x);
get_buffer_readback(buffer, &rb);
SetRect(&rect, 0, 0, U(uav_desc).Buffer.NumElements, 1);
SetRect(&rect, 0, 0, U(uav_desc).Buffer.NumElements * buffer_desc.StructureByteStride / sizeof(uvec4.x), 1);
check_readback_data_color(&rb, &rect, fe_uvec4.x, 0);
SetRect(&rect, U(uav_desc).Buffer.NumElements, 0, buffer_desc.ByteWidth / sizeof(uvec4.x), 1);
rect.left = rect.right;
rect.right = buffer_desc.ByteWidth / sizeof(uvec4.x);
check_readback_data_color(&rb, &rect, uvec4.x, 0);
release_resource_readback(&rb);
}

7
dlls/wined3d/view.c
View file

@ -1985,11 +1985,16 @@ void wined3d_unordered_access_view_vk_clear(struct wined3d_unordered_access_view
if (resource->type == WINED3D_RTYPE_BUFFER)
{
struct wined3d_buffer *buffer = buffer_from_resource(resource);
uav_location = WINED3D_LOCATION_BUFFER;
layout = state->buffer_layout;
vk_writes[0].descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER;
constants.extent.width = view_desc->u.buffer.count;
if (buffer->structure_byte_stride)
constants.extent.width = view_desc->u.buffer.count * buffer->structure_byte_stride / 4;
else
constants.extent.width = view_desc->u.buffer.count;
constants.extent.height = 1;
}
else