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/shader-runner: Report whole-block errors on the block's starting line.

Browse Source 
So, if there is an error or a trace on "[pixel shader]" or similar
blocks, they get reported in the line with the tag at the beginning of
the block and no on the line where the next block starts.
This commit is contained in:
Francisco Casas 2024-04-04 12:44:27 -03:00 committed by Alexandre Julliard
parent 46fca3f9f4
commit dbb9cfd958
Notes: Alexandre Julliard 2024-04-25 00:11:55 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Zebediah Figura (@zfigura)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/761
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tests/shader_runner.c
View File

@ -1568,6 +1568,12 @@ static void trace_tags(const struct shader_runner_caps *caps)
trace("%s.\n", tags); trace("%s.\n", tags);
} }
static void update_line_number_context(const char *testname, unsigned int line_number)
{
vkd3d_test_pop_context();
vkd3d_test_push_context("%s:%u", testname, line_number);
}
void run_shader_tests(struct shader_runner *runner, const struct shader_runner_caps *caps, void run_shader_tests(struct shader_runner *runner, const struct shader_runner_caps *caps,
const struct shader_runner_ops *ops, void *dxc_compiler) const struct shader_runner_ops *ops, void *dxc_compiler)
{ {
@ -1575,7 +1581,7 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_c
struct resource_params current_resource; struct resource_params current_resource;
struct sampler *current_sampler = NULL; struct sampler *current_sampler = NULL;
enum parse_state state = STATE_NONE; enum parse_state state = STATE_NONE;
unsigned int i, line_number = 0; unsigned int i, line_number = 0, block_start_line_number = 0;
char *shader_source = NULL; char *shader_source = NULL;
HRESULT expect_hr = S_OK; HRESULT expect_hr = S_OK;
bool skip_tests = false; bool skip_tests = false;
@ -1609,17 +1615,19 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_c
else else
testname = test_options.filename; testname = test_options.filename;
vkd3d_test_push_context("%s:%u", testname, line_number);
for (;;) for (;;)
{ {
char *ret = fgets(line_buffer, sizeof(line_buffer), f); char *ret = fgets(line_buffer, sizeof(line_buffer), f);
const char *line = line_buffer; const char *line = line_buffer;
if (line_number++) line_number++;
vkd3d_test_pop_context();
vkd3d_test_push_context("%s:%u", testname, line_number);
if (!ret || line[0] == '[') if (!ret || line[0] == '[')
{ {
update_line_number_context(testname, block_start_line_number);
switch (state) switch (state)
{ {
case STATE_INPUT_LAYOUT: case STATE_INPUT_LAYOUT:
@ -1801,6 +1809,9 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_c
{ {
unsigned int index; unsigned int index;
block_start_line_number = line_number;
update_line_number_context(testname, line_number);
if (match_directive_substring(line, "[compute shader", &line)) if (match_directive_substring(line, "[compute shader", &line))
{ {
state = STATE_SHADER_COMPUTE; state = STATE_SHADER_COMPUTE;
@ -1953,6 +1964,8 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_c
} }
else if (line[0] != '%' && line[0] != '\n') else if (line[0] != '%' && line[0] != '\n')
{ {
update_line_number_context(testname, line_number);
switch (state) switch (state)
{ {
case STATE_NONE: case STATE_NONE:
@ -2008,8 +2021,8 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_c
} }
} }
if (line_number) /* Pop line_number context. */
vkd3d_test_pop_context(); vkd3d_test_pop_context();
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);