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: Factor out a set_default_target() helper.

Browse Source
This commit is contained in:
Elizabeth Figura 2024-05-17 19:51:56 -05:00 committed by Henri Verbeet
parent ded0733ff8
commit 7e868f1f4b
Notes: Henri Verbeet 2024-07-11 17:16:48 +02:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/870
1 changed files with 23 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
tests/shader_runner.c
View File

@ -639,12 +639,6 @@ struct resource *shader_runner_get_resource(struct shader_runner *runner, enum r
return NULL; return NULL;
} }
static bool shader_runner_has_target(struct shader_runner *runner)
{
return shader_runner_get_resource(runner, RESOURCE_TYPE_RENDER_TARGET, 0)
|| shader_runner_get_resource(runner, RESOURCE_TYPE_DEPTH_STENCIL, 0);
}
static void set_resource(struct shader_runner *runner, const struct resource_params *params) static void set_resource(struct shader_runner *runner, const struct resource_params *params)
{ {
struct resource *resource; struct resource *resource;
@ -684,6 +678,27 @@ static void set_resource(struct shader_runner *runner, const struct resource_par
runner->resources[runner->resource_count++] = resource; runner->resources[runner->resource_count++] = resource;
} }
static void set_default_target(struct shader_runner *runner)
{
struct resource_params params = {0};
if (shader_runner_get_resource(runner, RESOURCE_TYPE_RENDER_TARGET, 0)
|| shader_runner_get_resource(runner, RESOURCE_TYPE_DEPTH_STENCIL, 0))
return;
params.desc.slot = 0;
params.desc.type = RESOURCE_TYPE_RENDER_TARGET;
params.desc.dimension = RESOURCE_DIMENSION_2D;
params.desc.format = DXGI_FORMAT_R32G32B32A32_FLOAT;
params.data_type = TEXTURE_DATA_FLOAT;
params.desc.texel_size = 16;
params.desc.width = RENDER_TARGET_WIDTH;
params.desc.height = RENDER_TARGET_HEIGHT;
params.desc.level_count = 1;
set_resource(runner, &params);
}
static void set_uniforms(struct shader_runner *runner, size_t offset, size_t count, const void *uniforms) static void set_uniforms(struct shader_runner *runner, size_t offset, size_t count, const void *uniforms)
{ {
size_t initial_count = runner->uniform_count; size_t initial_count = runner->uniform_count;
@ -896,21 +911,7 @@ static void parse_test_directive(struct shader_runner *runner, const char *line)
if (!runner->hs_source != !runner->ds_source) if (!runner->hs_source != !runner->ds_source)
fatal_error("Have a domain or hull shader but not both.\n"); fatal_error("Have a domain or hull shader but not both.\n");
if (!shader_runner_has_target(runner)) set_default_target(runner);
{
memset(&params, 0, sizeof(params));
params.desc.slot = 0;
params.desc.type = RESOURCE_TYPE_RENDER_TARGET;
params.desc.dimension = RESOURCE_DIMENSION_2D;
params.desc.format = DXGI_FORMAT_R32G32B32A32_FLOAT;
params.data_type = TEXTURE_DATA_FLOAT;
params.desc.texel_size = 16;
params.desc.width = RENDER_TARGET_WIDTH;
params.desc.height = RENDER_TARGET_HEIGHT;
params.desc.level_count = 1;
set_resource(runner, &params);
}
for (i = 0; i < runner->input_element_count; ++i) for (i = 0; i < runner->input_element_count; ++i)
free(runner->input_elements[i].name); free(runner->input_elements[i].name);
@ -953,26 +954,11 @@ static void parse_test_directive(struct shader_runner *runner, const char *line)
{ {
unsigned int vertex_count, instance_count; unsigned int vertex_count, instance_count;
D3D_PRIMITIVE_TOPOLOGY topology; D3D_PRIMITIVE_TOPOLOGY topology;
struct resource_params params;
if (!runner->hs_source != !runner->ds_source) if (!runner->hs_source != !runner->ds_source)
fatal_error("Have a domain or hull shader but not both.\n"); fatal_error("Have a domain or hull shader but not both.\n");
if (!shader_runner_has_target(runner)) set_default_target(runner);
{
memset(&params, 0, sizeof(params));
params.desc.slot = 0;
params.desc.type = RESOURCE_TYPE_RENDER_TARGET;
params.desc.dimension = RESOURCE_DIMENSION_2D;
params.desc.format = DXGI_FORMAT_R32G32B32A32_FLOAT;
params.data_type = TEXTURE_DATA_FLOAT;
params.desc.texel_size = 16;
params.desc.width = RENDER_TARGET_WIDTH;
params.desc.height = RENDER_TARGET_HEIGHT;
params.desc.level_count = 1;
set_resource(runner, &params);
}
if (match_string(line, "triangle list", &line)) if (match_string(line, "triangle list", &line))
topology = D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST; topology = D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST;