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

tests/shader_runner: Allow UAV resources to be created without initial data.

Browse Source 
We can e.g. initialise these with a shader.
This commit is contained in:
Henri Verbeet 2024-02-12 20:27:52 +01:00 committed by Alexandre Julliard
parent 7d51a7d99c
commit f614d98759
Notes: Alexandre Julliard 2024-02-14 23:28:07 +01:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/651
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/shader_runner_d3d12.c
View File

@ -130,6 +130,7 @@ static struct resource *d3d12_runner_create_resource(struct shader_runner *r, co
D3D12_SUBRESOURCE_DATA resource_data[2]; D3D12_SUBRESOURCE_DATA resource_data[2];
struct d3d12_resource *resource; struct d3d12_resource *resource;
unsigned int buffer_offset = 0; unsigned int buffer_offset = 0;
D3D12_RESOURCE_STATES state;
if (params->level_count > ARRAY_SIZE(resource_data)) if (params->level_count > ARRAY_SIZE(resource_data))
fatal_error("Level count %u is too high.\n", params->level_count); fatal_error("Level count %u is too high.\n", params->level_count);
@ -185,14 +186,18 @@ static struct resource *d3d12_runner_create_resource(struct shader_runner *r, co
runner->heap = create_gpu_descriptor_heap(device, runner->heap = create_gpu_descriptor_heap(device,
D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, MAX_RESOURCE_DESCRIPTORS); D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, MAX_RESOURCE_DESCRIPTORS);
resource->resource = create_default_texture2d(device, params->width, params->height, 1, params->level_count, state = params->data ? D3D12_RESOURCE_STATE_COPY_DEST : D3D12_RESOURCE_STATE_UNORDERED_ACCESS;
params->format, D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST); resource->resource = create_default_texture2d(device, params->width, params->height, 1,
params->level_count, params->format, D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, state);
if (params->data)
{
upload_texture_data_with_states(resource->resource, resource_data, upload_texture_data_with_states(resource->resource, resource_data,
params->level_count, test_context->queue, test_context->list, params->level_count, test_context->queue, test_context->list,
RESOURCE_STATE_DO_NOT_CHANGE, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); RESOURCE_STATE_DO_NOT_CHANGE, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
reset_command_list(test_context->list, test_context->allocator); reset_command_list(test_context->list, test_context->allocator);
ID3D12Device_CreateUnorderedAccessView(device, resource->resource, }
NULL, NULL, get_cpu_descriptor_handle(test_context, runner->heap, resource->r.slot + MAX_RESOURCES)); ID3D12Device_CreateUnorderedAccessView(device, resource->resource, NULL, NULL,
get_cpu_descriptor_handle(test_context, runner->heap, resource->r.slot + MAX_RESOURCES));
break; break;
case RESOURCE_TYPE_BUFFER_UAV: case RESOURCE_TYPE_BUFFER_UAV:

9
tests/shader_runner_vulkan.c
View File

@ -310,6 +310,15 @@ static struct resource *vulkan_runner_create_resource(struct shader_runner *r, c
usage, format, &resource->memory); usage, format, &resource->memory);
resource->image_view = create_2d_image_view(runner, resource->image, format); resource->image_view = create_2d_image_view(runner, resource->image, format);
if (!params->data)
{
begin_command_buffer(runner);
transition_image_layout(runner, resource->image,
VK_IMAGE_LAYOUT_UNDEFINED, layout);
end_command_buffer(runner);
break;
}
staging_buffer = create_buffer(runner, params->data_size, staging_buffer = create_buffer(runner, params->data_size,
VK_BUFFER_USAGE_TRANSFER_SRC_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, &staging_memory); VK_BUFFER_USAGE_TRANSFER_SRC_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, &staging_memory);
VK_CALL(vkMapMemory(device, staging_memory, 0, VK_WHOLE_SIZE, 0, &data)); VK_CALL(vkMapMemory(device, staging_memory, 0, VK_WHOLE_SIZE, 0, &data));