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: Mark some tests in arithmetic-int-uniform.shader_test as buggy on MoltenVK < 1.2.11.

Browse Source 
The bug is already solved on recent MoltenVK versions, but the CI
is stuck with 1.2.9, so it's useful to filter these failures out.
This commit is contained in:
Giovanni Mascellani
2025-05-25 22:36:47 +02:00
committed by Henri Verbeet
parent 7f04060f33
commit c82d1aac4d
Notes: Henri Verbeet 2025-06-04 13:14:18 +02:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1534
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/hlsl/arithmetic-int-uniform.shader_test
View File

@@ -56,7 +56,7 @@ float4 main() : SV_TARGET
[test] [test]
uniform 0 float4 42.0 5.0 0.0 0.0 uniform 0 float4 42.0 5.0 0.0 0.0
todo(glsl | msl) draw quad todo(glsl | msl) draw quad
probe (0, 0) rgba (2.0, -2.0, 2.0, -2.0) bug(mvk<1.2.11) probe (0, 0) rgba (2.0, -2.0, 2.0, -2.0)
[pixel shader] [pixel shader]
uniform float2 a; uniform float2 a;
@@ -86,7 +86,7 @@ float4 main() : SV_TARGET
[test] [test]
uniform 0 float4 45.0 5.0 0.0 0.0 uniform 0 float4 45.0 5.0 0.0 0.0
todo(glsl | msl) draw quad todo(glsl | msl) draw quad
probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) bug(mvk<1.2.11) probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0)
[pixel shader] [pixel shader]
uniform float4 a; uniform float4 a;
@@ -135,7 +135,7 @@ float4 main() : sv_target
uniform 0 float 10.0 uniform 0 float 10.0
todo(glsl | msl) draw quad todo(glsl | msl) draw quad
if(sm<4) probe (0, 0) rgba(6, 6, -6, -6) if(sm<4) probe (0, 0) rgba(6, 6, -6, -6)
if(sm>=4) probe (0, 0) rgba(7, 7, -7, -7) if(sm>=4) bug(mvk<1.2.11) probe (0, 0) rgba(7, 7, -7, -7)
[pixel shader] [pixel shader]
float f; float f;
@@ -232,7 +232,7 @@ float4 main() : SV_TARGET
[test] [test]
uniform 0 int64_t2 42000000000 5000000000 uniform 0 int64_t2 42000000000 5000000000
draw quad draw quad
probe (0, 0) rgba (2.0e9, -2.0e9, 2.0e9, -2.0e9) bug(mvk<1.2.11) probe (0, 0) rgba (2.0e9, -2.0e9, 2.0e9, -2.0e9)
[pixel shader] [pixel shader]
uniform int64_t2 a; uniform int64_t2 a;

3
tests/shader_runner.c
View File

@@ -147,6 +147,8 @@ static bool match_tag(struct shader_runner *runner, const char *tag)
static bool check_qualifier_args_conjunction(struct shader_runner *runner, static bool check_qualifier_args_conjunction(struct shader_runner *runner,
const char *line, const char **const rest, uint32_t *model_mask) const char *line, const char **const rest, uint32_t *model_mask)
{ {
/* Tags are tested in this order, so tag X must appear before Y if Y is a
* prefix of X. */
static const char *const valid_tags[] = static const char *const valid_tags[] =
{ {
"d3d12", "d3d12",
@@ -154,6 +156,7 @@ static bool check_qualifier_args_conjunction(struct shader_runner *runner,
"llvmpipe", "llvmpipe",
"mesa<23.3", "mesa<23.3",
"msl", "msl",
"mvk<1.2.11",
"mvk", "mvk",
"opengl", "opengl",
"vulkan", "vulkan",

2
tests/shader_runner_d3d12.c
View File

@@ -1053,6 +1053,8 @@ static void d3d12_runner_init_caps(struct d3d12_shader_runner *runner,
if (is_mvk_device(device)) if (is_mvk_device(device))
{ {
runner->caps.tags[runner->caps.tag_count++] = "mvk"; runner->caps.tags[runner->caps.tag_count++] = "mvk";
if (is_mvk_device_lt(device, 1, 2, 11))
runner->caps.tags[runner->caps.tag_count++] = "mvk<1.2.11";
} }
else else
{ {