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/shader_runner: Don't bother distinguishing directive substrings.

Browse Source 
Consider ']' a terminator for any string.
This commit is contained in:
Elizabeth Figura 2024-12-10 18:10:59 -06:00 committed by Henri Verbeet
parent 830bdd0037
commit 5827197246
Notes: Henri Verbeet 2024-12-12 17:49:10 +01:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1315
1 changed files with 16 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
tests/shader_runner.c
View File

@ -213,17 +213,16 @@ static bool check_qualifier_args(struct shader_runner *runner, const char *line,
return holds; return holds;
} }
static bool match_string_generic(struct shader_runner *runner, const char *line, const char *token, static bool match_string_generic(struct shader_runner *runner, const char *line,
const char **const rest, bool exclude_bracket, bool allow_qualifier_args) const char *token, const char **const rest, bool allow_qualifier_args)
{ {
size_t len = strlen(token); size_t len = strlen(token);
bool holds = true; bool holds = true;
while (isspace(*line) || (exclude_bracket && *line == ']')) while (isspace(*line))
++line; ++line;
if (strncmp(line, token, len) || !(isspace(line[len]) || line[len] == '(' if (strncmp(line, token, len) || !(isspace(line[len]) || line[len] == '(' || line[len] == ']'))
|| (exclude_bracket && line[len] == ']')))
return false; return false;
line += len; line += len;
@ -242,23 +241,12 @@ static bool match_string_generic(struct shader_runner *runner, const char *line,
static bool match_string_with_args(struct shader_runner *runner, static bool match_string_with_args(struct shader_runner *runner,
const char *line, const char *token, const char **const rest) const char *line, const char *token, const char **const rest)
{ {
return match_string_generic(runner, line, token, rest, false, true); return match_string_generic(runner, line, token, rest, true);
} }
static bool match_string(const char *line, const char *token, const char **const rest) static bool match_string(const char *line, const char *token, const char **const rest)
{ {
return match_string_generic(NULL, line, token, rest, false, false); return match_string_generic(NULL, line, token, rest, false);
}
static bool match_directive_substring_with_args(struct shader_runner *runner,
const char *line, const char *token, const char **const rest)
{
return match_string_generic(runner, line, token, rest, true, true);
}
static bool match_directive_substring(const char *line, const char *token, const char **const rest)
{
return match_string_generic(NULL, line, token, rest, true, false);
} }
static const char *close_parentheses(const char *line) static const char *close_parentheses(const char *line)
@ -1702,18 +1690,18 @@ static void read_shader_directive(struct shader_runner *runner,
{ {
const char *src_start = src; const char *src_start = src;
if (match_directive_substring_with_args(runner, src, "todo", &src)) if (match_string_with_args(runner, src, "todo", &src))
{ {
/* 'todo' is not meaningful when dxcompiler is in use. */ /* 'todo' is not meaningful when dxcompiler is in use. */
if (runner->minimum_shader_model >= SHADER_MODEL_6_0) if (runner->minimum_shader_model >= SHADER_MODEL_6_0)
continue; continue;
runner->is_todo = true; runner->is_todo = true;
} }
else if (match_directive_substring_with_args(runner, src, "fail", &src)) else if (match_string_with_args(runner, src, "fail", &src))
{ {
*expect_hr = E_FAIL; *expect_hr = E_FAIL;
} }
else if (match_directive_substring_with_args(runner, src, "notimpl", &src)) else if (match_string_with_args(runner, src, "notimpl", &src))
{ {
*expect_hr = E_NOTIMPL; *expect_hr = E_NOTIMPL;
} }
@ -2048,7 +2036,7 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_c
block_start_line_number = line_number; block_start_line_number = line_number;
update_line_number_context(testname, line_number); update_line_number_context(testname, line_number);
if (match_directive_substring(line, "[compute shader", &line)) if (match_string(line, "[compute shader", &line))
{ {
state = STATE_SHADER; state = STATE_SHADER;
shader_type = SHADER_TYPE_CS; shader_type = SHADER_TYPE_CS;
@ -2063,7 +2051,7 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_c
runner->compile_options = 0; runner->compile_options = 0;
test_action = TEST_ACTION_RUN; test_action = TEST_ACTION_RUN;
} }
else if (match_directive_substring(line, "[pixel shader", &line)) else if (match_string(line, "[pixel shader", &line))
{ {
state = STATE_SHADER; state = STATE_SHADER;
shader_type = SHADER_TYPE_PS; shader_type = SHADER_TYPE_PS;
@ -2162,27 +2150,27 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_c
{ {
state = STATE_PREPROC_INVALID; state = STATE_PREPROC_INVALID;
} }
else if (match_directive_substring(line, "[vertex shader", &line)) else if (match_string(line, "[vertex shader", &line))
{ {
state = STATE_SHADER; state = STATE_SHADER;
shader_type = SHADER_TYPE_VS; shader_type = SHADER_TYPE_VS;
} }
else if (match_directive_substring(line, "[effect", &line)) else if (match_string(line, "[effect", &line))
{ {
state = STATE_SHADER; state = STATE_SHADER;
shader_type = SHADER_TYPE_FX; shader_type = SHADER_TYPE_FX;
} }
else if (match_directive_substring(line, "[hull shader", &line)) else if (match_string(line, "[hull shader", &line))
{ {
state = STATE_SHADER; state = STATE_SHADER;
shader_type = SHADER_TYPE_HS; shader_type = SHADER_TYPE_HS;
} }
else if (match_directive_substring(line, "[domain shader", &line)) else if (match_string(line, "[domain shader", &line))
{ {
state = STATE_SHADER; state = STATE_SHADER;
shader_type = SHADER_TYPE_DS; shader_type = SHADER_TYPE_DS;
} }
else if (match_directive_substring(line, "[geometry shader", &line)) else if (match_string(line, "[geometry shader", &line))
{ {
state = STATE_SHADER; state = STATE_SHADER;
shader_type = SHADER_TYPE_GS; shader_type = SHADER_TYPE_GS;