wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

tests: Allow using multiple [test] directives in the same shader_test file.

Browse Source 
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Giovanni Mascellani <gmascellani@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 2021-11-05 19:35:47 +01:00 committed by Alexandre Julliard
parent 00d5f4e761
commit da2dcb128e
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tests/shader_runner_d3d12.c
View File

@ -305,17 +305,21 @@ static void parse_test_directive(struct shader_context *context, const char *lin
range->RegisterSpace = 0; range->RegisterSpace = 0;
range->OffsetInDescriptorsFromTableStart = 0; range->OffsetInDescriptorsFromTableStart = 0;
texture->heap = create_gpu_descriptor_heap(context->c.device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1); if (!texture->resource)
texture->resource = create_default_texture(context->c.device, texture->width, texture->height, {
texture->format, 0, D3D12_RESOURCE_STATE_COPY_DEST); texture->heap = create_gpu_descriptor_heap(context->c.device,
resource_data.pData = texture->data; D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1);
resource_data.SlicePitch = resource_data.RowPitch = texture->width * texture->texel_size; texture->resource = create_default_texture(context->c.device, texture->width, texture->height,
upload_texture_data(texture->resource, &resource_data, 1, context->c.queue, command_list); texture->format, 0, D3D12_RESOURCE_STATE_COPY_DEST);
reset_command_list(command_list, context->c.allocator); resource_data.pData = texture->data;
transition_resource_state(command_list, texture->resource, D3D12_RESOURCE_STATE_COPY_DEST, resource_data.SlicePitch = resource_data.RowPitch = texture->width * texture->texel_size;
D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE | D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE); upload_texture_data(texture->resource, &resource_data, 1, context->c.queue, command_list);
ID3D12Device_CreateShaderResourceView(context->c.device, texture->resource, reset_command_list(command_list, context->c.allocator);
NULL, get_cpu_descriptor_handle(&context->c, texture->heap, 0)); transition_resource_state(command_list, texture->resource, D3D12_RESOURCE_STATE_COPY_DEST,
D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE | D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE);
ID3D12Device_CreateShaderResourceView(context->c.device, texture->resource,
NULL, get_cpu_descriptor_handle(&context->c, texture->heap, 0));
}
} }
assert(root_signature_desc.NumParameters <= ARRAY_SIZE(root_params)); assert(root_signature_desc.NumParameters <= ARRAY_SIZE(root_params));
@ -650,6 +654,10 @@ START_TEST(shader_runner_d3d12)
if (!strcmp(line, "[pixel shader]\n")) if (!strcmp(line, "[pixel shader]\n"))
{ {
state = STATE_SHADER_PIXEL; state = STATE_SHADER_PIXEL;
if (context.ps_code)
ID3D10Blob_Release(context.ps_code);
context.ps_code = NULL;
} }
else if (!strcmp(line, "[pixel shader fail]\n")) else if (!strcmp(line, "[pixel shader fail]\n"))
{ {