wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-04-13 05:43:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

tests/shader-runner: Change probe directive syntax on shader_test files.

Browse Source 
For consistency with the previous commit.
This commit is contained in:
Francisco Casas
2024-01-24 16:35:39 -03:00
committed by Alexandre Julliard
parent b08be04465
commit 4fe9ab0a90
Notes: Alexandre Julliard 2024-02-19 22:59:16 +01:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Zebediah Figura (@zfigura)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/569
4 changed files with 24 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tests/hlsl/matrix-semantics.shader_test
View File

@ -45,10 +45,10 @@ row_major float4x1 main() : sv_target
[test] [test]
todo(sm>=6) draw quad todo(sm>=6) draw quad
probe render target 0 all r (1.0) probe rtv 0 all r (1.0)
probe render target 1 all r (2.0) probe rtv 1 all r (2.0)
probe render target 2 all r (3.0) probe rtv 2 all r (3.0)
probe render target 3 all r (4.0) probe rtv 3 all r (4.0)
[pixel shader fail(sm>=6)] [pixel shader fail(sm>=6)]
float1x4 main() : sv_target float1x4 main() : sv_target
@ -58,10 +58,10 @@ float1x4 main() : sv_target
[test] [test]
todo(sm>=6) draw quad todo(sm>=6) draw quad
probe render target 0 all r (1.0) probe rtv 0 all r (1.0)
probe render target 1 all r (2.0) probe rtv 1 all r (2.0)
probe render target 2 all r (3.0) probe rtv 2 all r (3.0)
probe render target 3 all r (4.0) probe rtv 3 all r (4.0)
[pixel shader fail] [pixel shader fail]
void main(out float1x2 x : sv_target0, out float1x2 y : sv_target1) void main(out float1x2 x : sv_target0, out float1x2 y : sv_target1)
@ -79,10 +79,10 @@ void main(out float1x2 x : sv_target0, out float1x2 y : sv_target2)
[test] [test]
todo(sm>=6) draw quad todo(sm>=6) draw quad
probe render target 0 all r (1.0) probe rtv 0 all r (1.0)
probe render target 1 all r (2.0) probe rtv 1 all r (2.0)
probe render target 2 all r (5.0) probe rtv 2 all r (5.0)
probe render target 3 all r (6.0) probe rtv 3 all r (6.0)
[rtv 0] [rtv 0]
format r32g32b32a32 float format r32g32b32a32 float
@ -97,6 +97,6 @@ void main(out row_major float1x4 x : sv_target0, out float1x2 y : sv_target1)
[test] [test]
todo(sm>=6) draw quad todo(sm>=6) draw quad
probe render target 0 all rgba (1.0, 2.0, 3.0, 4.0) probe rtv 0 all rgba (1.0, 2.0, 3.0, 4.0)
probe render target 1 all r (5.0) probe rtv 1 all r (5.0)
probe render target 2 all r (6.0) probe rtv 2 all r (6.0)

4
tests/hlsl/multiple-rt.shader_test
View File

@ -15,5 +15,5 @@ void main(out float4 o0 : sv_target0, out float4 o1 : sv_target1)
[test] [test]
draw quad draw quad
probe render target 0 all rgba (0.1, 0.2, 0.3, 0.4) probe rtv 0 all rgba (0.1, 0.2, 0.3, 0.4)
probe render target 1 all rgba (0.5, 0.6, 0.7, 0.8) probe rtv 1 all rgba (0.5, 0.6, 0.7, 0.8)

2
tests/hlsl/uav-rwbuffer.shader_test
View File

@ -179,4 +179,4 @@ float4 main() : sv_target1
[test] [test]
todo(sm>=6) draw quad todo(sm>=6) draw quad
probe buffer uav 2 (0, 0) rgba (11.1, 12.2, 13.3, 14.4) probe uav 2 (0) rgba (11.1, 12.2, 13.3, 14.4)

17
tests/shader_runner.c
View File

@ -842,17 +842,7 @@ static void parse_test_directive(struct shader_runner *runner, const char *line)
resource = shader_runner_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)) else if (match_string(line, "rtv", &line))
{
slot = strtoul(line, &rest, 10);
if (rest == line)
fatal_error("Malformed buffer UAV index '%s'.\n", line);
line = rest;
resource = shader_runner_get_resource(runner, RESOURCE_TYPE_UAV, slot);
}
else if (match_string(line, "render target", &line))
{ {
slot = strtoul(line, &rest, 10); slot = strtoul(line, &rest, 10);
@ -883,6 +873,11 @@ static void parse_test_directive(struct shader_runner *runner, const char *line)
set_rect(&rect, left, top, left + 1, top + 1); set_rect(&rect, left, top, left + 1, top + 1);
line += len; line += len;
} }
else if (sscanf(line, " ( %u )%n", &left, &len) == 1)
{
set_rect(&rect, left, 0, left + 1, 1);
line += len;
}
else else
{ {
fatal_error("Malformed probe arguments '%s'.\n", line); fatal_error("Malformed probe arguments '%s'.\n", line);