wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

tests: Introduce an OpenGL shader runner.

Browse Source
This commit is contained in:
Henri Verbeet
2023-09-22 07:31:31 +02:00
committed by Alexandre Julliard
parent 4e1bf5e163
commit beb3f6e0c2
Notes: Alexandre Julliard 2023-11-22 22:49:31 +01:00 
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/486
6 changed files with 1033 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/shader_runner.c
View File

@@ -395,7 +395,7 @@ void init_resource(struct resource *resource, const struct resource_params *para
resource->height = params->height;
}
static struct resource *get_resource(struct shader_runner *runner, enum resource_type type, unsigned int slot)
struct resource *shader_runner_get_resource(struct shader_runner *runner, enum resource_type type, unsigned int slot)
{
struct resource *resource;
size_t i;
@@ -575,7 +575,7 @@ static void parse_test_directive(struct shader_runner *runner, const char *line)
"{\n"
"}";
if (!get_resource(runner, RESOURCE_TYPE_RENDER_TARGET, 0))
if (!shader_runner_get_resource(runner, RESOURCE_TYPE_RENDER_TARGET, 0))
{
memset(&params, 0, sizeof(params));
params.slot = 0;
@@ -620,7 +620,7 @@ static void parse_test_directive(struct shader_runner *runner, const char *line)
unsigned int vertex_count;
char *rest;
if (!get_resource(runner, RESOURCE_TYPE_RENDER_TARGET, 0))
if (!shader_runner_get_resource(runner, RESOURCE_TYPE_RENDER_TARGET, 0))
{
memset(&params, 0, sizeof(params));
params.slot = 0;
@@ -667,7 +667,7 @@ static void parse_test_directive(struct shader_runner *runner, const char *line)
fatal_error("Malformed UAV index '%s'.\n", line);
line = rest;
resource = get_resource(runner, RESOURCE_TYPE_UAV, slot);
resource = shader_runner_get_resource(runner, RESOURCE_TYPE_UAV, slot);
}
else if (match_string(line, "buffer uav", &line))
{
@@ -677,7 +677,7 @@ static void parse_test_directive(struct shader_runner *runner, const char *line)
fatal_error("Malformed buffer UAV index '%s'.\n", line);
line = rest;
resource = get_resource(runner, RESOURCE_TYPE_BUFFER_UAV, slot);
resource = shader_runner_get_resource(runner, RESOURCE_TYPE_BUFFER_UAV, slot);
}
else if (match_string(line, "render target", &line))
{
@@ -687,11 +687,11 @@ static void parse_test_directive(struct shader_runner *runner, const char *line)
fatal_error("Malformed render target index '%s'.\n", line);
line = rest;
resource = get_resource(runner, RESOURCE_TYPE_RENDER_TARGET, slot);
resource = shader_runner_get_resource(runner, RESOURCE_TYPE_RENDER_TARGET, slot);
}
else
{
resource = get_resource(runner, RESOURCE_TYPE_RENDER_TARGET, 0);
resource = shader_runner_get_resource(runner, RESOURCE_TYPE_RENDER_TARGET, 0);
}
rb = runner->ops->get_resource_readback(runner, resource);
@@ -829,7 +829,7 @@ static void parse_test_directive(struct shader_runner *runner, const char *line)
}
}
static struct sampler *get_sampler(struct shader_runner *runner, unsigned int slot)
struct sampler *shader_runner_get_sampler(struct shader_runner *runner, unsigned int slot)
{
struct sampler *sampler;
size_t i;
@@ -1325,7 +1325,7 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_o
{
state = STATE_SAMPLER;
if (!(current_sampler = get_sampler(runner, index)))
if (!(current_sampler = shader_runner_get_sampler(runner, index)))
{
if (runner->sampler_count == MAX_SAMPLERS)
fatal_error("Too many samplers declared.\n");
@@ -1640,6 +1640,11 @@ START_TEST(shader_runner)
#else
trace("Running tests from a Unix build\n");
# ifdef HAVE_OPENGL
trace("Compiling shaders with vkd3d-shader and executing with OpenGL\n");
run_shader_tests_gl();
# endif
trace("Compiling shaders with vkd3d-shader and executing with Vulkan\n");
run_shader_tests_vulkan();