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/shader_runner: Introduce the "u32" probe format.

Browse Source
This commit is contained in:
Henri Verbeet
2025-06-06 00:25:11 +02:00
parent 95cf0a8b2c
commit 9c987e5a0b
Notes: Henri Verbeet 2025-06-10 18:06:45 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1555
28 changed files with 357 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
tests/shader_runner.c
View File

@@ -818,7 +818,7 @@ static void read_uint(const char **line, unsigned int *u, bool is_uniform)
if (*u != val)
fatal_error("Out of range uint constant '%.*s'.\n", (int)(rest - *line), *line);
*line = rest + (!is_uniform && *rest == ',');
*line = rest;
}
static void read_int4(const char **line, struct ivec4 *v)
@@ -829,12 +829,12 @@ static void read_int4(const char **line, struct ivec4 *v)
read_int(line, &v->w, true);
}
static void read_uint4(const char **line, struct uvec4 *v, bool is_uniform)
static void read_uint4(const char **line, struct uvec4 *v)
{
read_uint(line, &v->x, is_uniform);
read_uint(line, &v->y, is_uniform);
read_uint(line, &v->z, is_uniform);
read_uint(line, &v->w, is_uniform);
read_uint(line, &v->x, true);
read_uint(line, &v->y, true);
read_uint(line, &v->z, true);
read_uint(line, &v->w, true);
}
static void read_int64(const char **line, int64_t *i, bool is_uniform)
@@ -1288,40 +1288,52 @@ static void parse_test_directive(struct shader_runner *runner, const char *line)
check_readback_data_double(rb, &rect, v.x, ulps);
}
}
else if (match_string(line, "i32", &line))
else if (match_string(line, "u32", &line) || (is_signed = match_string(line, "i32", &line)))
{
struct ivec4 v;
struct uvec4 v;
if (*line != '(')
fatal_error("Malformed probe arguments '%s'.\n", line);
++line;
read_int(&line, &v.x, false);
if (is_signed)
read_int(&line, (int32_t *)&v.x, false);
else
read_uint(&line, &v.x, false);
while (isspace(*line))
++line;
if (*line == ',')
{
++line;
read_int(&line, &v.y, false);
if (is_signed)
read_int(&line, (int32_t *)&v.y, false);
else
read_uint(&line, &v.y, false);
while (isspace(*line))
++line;
if (*line != ',')
fatal_error("Malformed probe arguments '%s'.\n", line);
++line;
read_int(&line, &v.z, false);
if (is_signed)
read_int(&line, (int32_t *)&v.z, false);
else
read_uint(&line, &v.z, false);
while (isspace(*line))
++line;
if (*line != ',')
fatal_error("Malformed probe arguments '%s'.\n", line);
++line;
read_int(&line, &v.w, false);
if (is_signed)
read_int(&line, (int32_t *)&v.w, false);
else
read_uint(&line, &v.w, false);
line = close_parentheses(line);
todo_if(runner->is_todo) bug_if(runner->is_bug)
check_readback_data_ivec4(rb, &rect, &v);
check_readback_data_uvec4(rb, &rect, &v);
}
else
{
@@ -1330,18 +1342,6 @@ static void parse_test_directive(struct shader_runner *runner, const char *line)
check_readback_data_uint(rb, &box, v.x, 0);
}
}
else if (match_string(line, "rgbaui", &line))
{
struct uvec4 v;
if (*line != '(')
fatal_error("Malformed probe arguments '%s'.\n", line);
++line;
read_uint4(&line, &v, false);
line = close_parentheses(line);
todo_if(runner->is_todo) bug_if(runner->is_bug)
check_readback_data_uvec4(rb, &rect, &v);
}
else if (match_string(line, "rgba", &line))
{
struct vec4 v;
@@ -1366,18 +1366,6 @@ static void parse_test_directive(struct shader_runner *runner, const char *line)
todo_if(runner->is_todo) bug_if(runner->is_bug)
check_readback_data_vec2(rb, &rect, &v, ulps);
}
else if (match_string(line, "rui", &line))
{
unsigned int expect;
if (*line != '(')
fatal_error("Malformed probe arguments '%s'.\n", line);
++line;
read_uint(&line, &expect, false);
line = close_parentheses(line);
todo_if(runner->is_todo) bug_if(runner->is_bug)
check_readback_data_uint(rb, &box, expect, 0);
}
else if (match_string(line, "r", &line))
{
float expect;
@@ -1440,7 +1428,7 @@ static void parse_test_directive(struct shader_runner *runner, const char *line)
{
struct uvec4 v;
read_uint4(&line, &v, true);
read_uint4(&line, &v);
set_uniforms(runner, offset, 4, &v);
}
else if (match_string(line, "int", &line))