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: Mark individual invalid shaders as todo.

Browse Source 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Giovanni Mascellani <gmascellani@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2022-04-18 08:33:57 +02:00 committed by Alexandre Julliard
parent 0929ec7462
commit f187b48792
4 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -317,9 +317,6 @@ tests_shader_runner_SOURCES = \
tests_vkd3d_api_LDADD = libvkd3d.la @DL_LIBS@ tests_vkd3d_api_LDADD = libvkd3d.la @DL_LIBS@
tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la
SHADER_TEST_LOG_COMPILER = tests/shader_runner SHADER_TEST_LOG_COMPILER = tests/shader_runner
XFAIL_TESTS = \
tests/hlsl-function.shader_test \
tests/hlsl-return-implicit-conversion.shader_test
endif endif
EXTRA_DIST += $(vkd3d_shader_tests) EXTRA_DIST += $(vkd3d_shader_tests)

14
tests/hlsl-function.shader_test
View File

@ -1,4 +1,4 @@
[pixel shader fail] [pixel shader fail todo]
float4 func(); float4 func();
@ -23,7 +23,7 @@ float4 main() : sv_target
return 0; return 0;
} }
[pixel shader fail] [pixel shader fail todo]
void func(inout float o) void func(inout float o)
{ {
@ -37,7 +37,7 @@ float4 main() : sv_target
return 0; return 0;
} }
[pixel shader fail] [pixel shader fail todo]
void func(inout float2 o) void func(inout float2 o)
{ {
@ -51,7 +51,7 @@ float4 main() : sv_target
return 0; return 0;
} }
[pixel shader fail] [pixel shader fail todo]
void func(out float o) void func(out float o)
{ {
@ -65,7 +65,7 @@ float4 main() : sv_target
return x; return x;
} }
[pixel shader fail] [pixel shader fail todo]
void func(inout float o) void func(inout float o)
{ {
@ -78,7 +78,7 @@ float4 main() : sv_target
return x; return x;
} }
[pixel shader fail] [pixel shader fail todo]
void func() void func()
{ {
@ -89,7 +89,7 @@ float4 main() : sv_target
return func(); return func();
} }
[pixel shader fail] [pixel shader fail todo]
void foo() void foo()
{ {

10
tests/hlsl-return-implicit-conversion.shader_test
View File

@ -98,7 +98,7 @@ float4 main() : sv_target
todo draw quad todo draw quad
probe all rgba (0.4, 0.3, 0.2, 0.0) probe all rgba (0.4, 0.3, 0.2, 0.0)
[pixel shader fail] [pixel shader fail todo]
float3x1 func() float3x1 func()
{ {
return float1x3(0.4, 0.3, 0.2); return float1x3(0.4, 0.3, 0.2);
@ -109,7 +109,7 @@ float4 main() : sv_target
return float4(func(), 0.0); return float4(func(), 0.0);
} }
[pixel shader fail] [pixel shader fail todo]
float1x3 func() float1x3 func()
{ {
return float3x1(0.4, 0.3, 0.2); return float3x1(0.4, 0.3, 0.2);
@ -165,7 +165,7 @@ float4 main() : sv_target
todo draw quad todo draw quad
probe all rgba (0.4, 0.3, 0.2, 0.0) probe all rgba (0.4, 0.3, 0.2, 0.0)
[pixel shader fail] [pixel shader fail todo]
float3x1 func() float3x1 func()
{ {
return float4(0.4, 0.3, 0.2, 0.1); return float4(0.4, 0.3, 0.2, 0.1);
@ -191,7 +191,7 @@ float4 main() : sv_target
todo draw quad todo draw quad
probe all rgba (0.4, 0.3, 0.2, 0.0) probe all rgba (0.4, 0.3, 0.2, 0.0)
[pixel shader fail] [pixel shader fail todo]
float3x1 func() float3x1 func()
{ {
return float1x4(0.4, 0.3, 0.2, 0.1); return float1x4(0.4, 0.3, 0.2, 0.1);
@ -217,7 +217,7 @@ float4 main() : sv_target
todo draw quad todo draw quad
probe all rgba (0.4, 0.3, 0.2, 0.0) probe all rgba (0.4, 0.3, 0.2, 0.0)
[pixel shader fail] [pixel shader fail todo]
float1x3 func() float1x3 func()
{ {
return float4x1(0.4, 0.3, 0.2, 0.1); return float4x1(0.4, 0.3, 0.2, 0.1);

21
tests/shader_runner.c
View File

@ -80,6 +80,7 @@ enum parse_state
STATE_REQUIRE, STATE_REQUIRE,
STATE_SAMPLER, STATE_SAMPLER,
STATE_SHADER_INVALID_PIXEL, STATE_SHADER_INVALID_PIXEL,
STATE_SHADER_INVALID_PIXEL_TODO,
STATE_SHADER_PIXEL, STATE_SHADER_PIXEL,
STATE_SHADER_VERTEX, STATE_SHADER_VERTEX,
STATE_TEXTURE, STATE_TEXTURE,
@ -642,15 +643,24 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const
break; break;
case STATE_SHADER_INVALID_PIXEL: case STATE_SHADER_INVALID_PIXEL:
case STATE_SHADER_INVALID_PIXEL_TODO:
{ {
ID3D10Blob *blob = NULL, *errors = NULL; ID3D10Blob *blob = NULL, *errors = NULL;
HRESULT hr; HRESULT hr;
hr = D3DCompile(shader_source, strlen(shader_source), NULL, hr = D3DCompile(shader_source, strlen(shader_source), NULL,
NULL, NULL, "main", "ps_4_0", 0, 0, &blob, &errors); NULL, NULL, "main", "ps_4_0", 0, 0, &blob, &errors);
ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); todo_if (state == STATE_SHADER_INVALID_PIXEL_TODO)
ok(!blob, "Expected no compiled shader blob.\n"); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr);
ok(!!errors, "Expected non-NULL error blob.\n"); if (hr == S_OK)
{
ID3D10Blob_Release(blob);
}
else
{
ok(!blob, "Expected no compiled shader blob.\n");
ok(!!errors, "Expected non-NULL error blob.\n");
}
if (errors) if (errors)
{ {
if (vkd3d_test_state.debug_level) if (vkd3d_test_state.debug_level)
@ -735,6 +745,10 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const
{ {
state = STATE_SHADER_INVALID_PIXEL; state = STATE_SHADER_INVALID_PIXEL;
} }
else if (!strcmp(line, "[pixel shader fail todo]\n"))
{
state = STATE_SHADER_INVALID_PIXEL_TODO;
}
else if (sscanf(line, "[sampler %u]\n", &index)) else if (sscanf(line, "[sampler %u]\n", &index))
{ {
state = STATE_SAMPLER; state = STATE_SAMPLER;
@ -817,6 +831,7 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const
case STATE_PREPROC: case STATE_PREPROC:
case STATE_PREPROC_INVALID: case STATE_PREPROC_INVALID:
case STATE_SHADER_INVALID_PIXEL: case STATE_SHADER_INVALID_PIXEL:
case STATE_SHADER_INVALID_PIXEL_TODO:
case STATE_SHADER_PIXEL: case STATE_SHADER_PIXEL:
case STATE_SHADER_VERTEX: case STATE_SHADER_VERTEX:
{ {