mirror of
https://gitlab.winehq.org/wine/vkd3d.git
synced 2024-11-21 16:46:41 -08:00
tests: Allow using multiple [test] directives in the same shader_test file.
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:
parent
00d5f4e761
commit
da2dcb128e
@ -305,7 +305,10 @@ static void parse_test_directive(struct shader_context *context, const char *lin
|
||||
range->RegisterSpace = 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->heap = create_gpu_descriptor_heap(context->c.device,
|
||||
D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1);
|
||||
texture->resource = create_default_texture(context->c.device, texture->width, texture->height,
|
||||
texture->format, 0, D3D12_RESOURCE_STATE_COPY_DEST);
|
||||
resource_data.pData = texture->data;
|
||||
@ -317,6 +320,7 @@ static void parse_test_directive(struct shader_context *context, const char *lin
|
||||
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));
|
||||
|
||||
@ -650,6 +654,10 @@ START_TEST(shader_runner_d3d12)
|
||||
if (!strcmp(line, "[pixel shader]\n"))
|
||||
{
|
||||
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"))
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user