wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-09-13 09:16:14 -07:00
Code Issues Packages Projects Releases Wiki Activity

tests/shader_runner: Replace spaces with dashes in format names.

Browse Source 
Probably good if we want to allow specifying several formats in the same
line, separated by spaces.

While at it, rename "r32g32 int" to "r32g32-sint".
This commit is contained in:
Francisco Casas 2024-08-01 21:03:46 -04:00 committed by Henri Verbeet
parent cec62c54ad
commit 19c23ca6f2
Notes: Henri Verbeet 2024-08-22 16:43:21 +02:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/991
33 changed files with 94 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/hlsl/bool-semantics.shader_test
View File

@ -2,11 +2,11 @@
shader model >= 4.0
[input layout]
0 r32g32b32a32 uint apple
0 r32g32 int sv_position
0 r32g32b32a32-uint apple
0 r32g32-sint sv_position
[vb 0]
format r32 uint
format r32-uint
0 1 0x80000000 0xffffffff -2 -2
0 1 0x80000000 0xffffffff -2 2
0 1 0x80000000 0xffffffff 2 -2

6
tests/hlsl/clip-distance.shader_test
View File

@ -2,8 +2,8 @@
shader model >= 4.0
[input layout]
0 r32g32 float POSITION
1 r32 float CLIP_DISTANCE
0 r32g32-float POSITION
1 r32-float CLIP_DISTANCE
[vb 0]
-1.0 -1.0
@ -18,7 +18,7 @@ shader model >= 4.0
1.0
[rtv 0]
format r32g32b32a32 float
format r32g32b32a32-float
size (2d, 640, 480)
[vertex shader todo]

2
tests/hlsl/compute.shader_test
View File

@ -2,7 +2,7 @@
shader model >= 5.0
[uav 0]
format r32 float
format r32-float
size (2d, 1, 1)
0.1

6
tests/hlsl/coverage.shader_test
View File

@ -2,7 +2,7 @@
shader model >= 4.1
[rtv 0]
format r32g32b32a32 float
format r32g32b32a32-float
size (2dms, 4, 640, 480)
[pixel shader]
@ -26,7 +26,7 @@ probe (0, 0) rgba (0.25, 0.25, 0.25, 0.25)
shader model >= 5.0
[uav 1]
format r32 uint
format r32-uint
size (2d, 4, 4)
0 0 0 0
0 0 0 0
@ -58,7 +58,7 @@ probe (0, 0) rgba (0.0, 0.75, 0.0, 0.75)
probe uav 1 (0, 0, 4, 4) rui (0x07)
[uav 1]
format r32 uint
format r32-uint
size (2d, 4, 4)
0 0 0 0
0 0 0 0

2
tests/hlsl/depth-out.shader_test
View File

@ -39,7 +39,7 @@ probe dsv (0,0) r (0.5)
shader model >= 5.0
[rtv 0]
format r32g32b32a32 float
format r32g32b32a32-float
size (2d, 640, 480)
[vertex shader]

2
tests/hlsl/discard.shader_test
View File

@ -44,7 +44,7 @@ probe (3, 1) rgba (1, 0, 0, 1)
shader model >= 5.0
[uav 1]
format r32 float
format r32-float
size (2d, 2, 1)
0.0 0.0

4
tests/hlsl/geometry.shader_test
View File

@ -2,8 +2,8 @@
shader model >= 4.0
[input layout]
0 r32g32b32a32 float SV_POSITION
0 r32g32b32a32 float COLOR
0 r32g32b32a32-float SV_POSITION
0 r32g32b32a32-float COLOR
[vb 0]
0.0 0.0 1.0 1.0 0.0 1.0 1.0 1.0

2
tests/hlsl/get-sample-pos.shader_test
View File

@ -3,7 +3,7 @@ shader model >= 4.1
[srv 0]
format r32g32b32a32 float
format r32g32b32a32-float
size (2dms, 4, 2, 2)
[pixel shader todo]

2
tests/hlsl/is-front-face.shader_test
View File

@ -2,7 +2,7 @@
shader model >= 4.0
[input layout]
0 r32g32 float sv_position
0 r32g32-float sv_position
[vb 0]
-2.0 -2.0

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

@ -22,19 +22,19 @@ todo(glsl) draw quad
probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0)
[rtv 0]
format r32 float
format r32-float
size (2d, 640, 480)
[rtv 1]
format r32 float
format r32-float
size (2d, 640, 480)
[rtv 2]
format r32 float
format r32-float
size (2d, 640, 480)
[rtv 3]
format r32 float
format r32-float
size (2d, 640, 480)
[pixel shader fail(sm>=6)]
@ -85,7 +85,7 @@ probe rtv 2 (0,0) r (5.0)
probe rtv 3 (0,0) r (6.0)
[rtv 0]
format r32g32b32a32 float
format r32g32b32a32-float
size (2d, 640, 480)
[pixel shader fail(sm>=6)]

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

@ -1,9 +1,9 @@
[rtv 0]
format r32g32b32a32 float
format r32g32b32a32-float
size (2d, 640, 480)
[rtv 1]
format r32g32b32a32 float
format r32g32b32a32-float
size (2d, 640, 480)
[pixel shader]

2
tests/hlsl/nointerpolation.shader_test
View File

@ -2,7 +2,7 @@
shader model >= 4.0
[input layout]
0 r32g32b32a32 float texcoord
0 r32g32b32a32-float texcoord
[vb 0]
0.0 1.0 0.0 1.0

2
tests/hlsl/numthreads.shader_test
View File

@ -165,7 +165,7 @@ void func() {}
void main() { func(); }
[uav 0]
format r32 float
format r32-float
size (2d, 2, 2)
1.0 1.0

6
tests/hlsl/rasteriser-ordered-views.shader_test
View File

@ -2,15 +2,15 @@
shader model >= 5.0
[rtv 0]
format r32 uint
format r32-uint
size (2d, 640, 480)
[uav 1]
format r32 uint
format r32-uint
size (2d, 640, 480)
[srv 0]
format r32g32b32a32 uint
format r32g32b32a32-uint
size (2d, 1, 1)
0 0 0 0

2
tests/hlsl/rt-get-sample-info.shader_test
View File

@ -3,7 +3,7 @@ shader model >= 4.1
[rtv 0]
format r32g32b32a32 float
format r32g32b32a32-float
size (2dms, 4, 640, 480)
[pixel shader]

2
tests/hlsl/sample-cmp.shader_test
View File

@ -7,7 +7,7 @@ address clamp clamp clamp
comparison never
[srv 0]
format r32 float shadow
format r32-float-shadow
size (2d, 2, 2)
0.5 0.5
0.5 0.5

14
tests/hlsl/shader-interstage-interface.shader_test
View File

@ -2,12 +2,12 @@
shader model >= 4.0
[input layout]
0 r32g32 float SV_POSITION
0 r32g32 float TEXCOORD 0
0 r32 float TEXCOORD 1
1 r32 uint TEXCOORD 2
1 r32 uint TEXCOORD 3
0 r32 float TEXCOORD 4
0 r32g32-float SV_POSITION
0 r32g32-float TEXCOORD 0
0 r32-float TEXCOORD 1
1 r32-uint TEXCOORD 2
1 r32-uint TEXCOORD 3
0 r32-float TEXCOORD 4
[vb 0]
-1.0 -1.0 3.0 5.0 5.0 7.0
@ -16,7 +16,7 @@ shader model >= 4.0
1.0 1.0 3.0 5.0 5.0 7.0
[vb 1]
format r32 uint
format r32-uint
2 6
2 6
2 6

10
tests/hlsl/sm6-uav-rwtexture.shader_test
View File

@ -2,13 +2,13 @@
shader model >= 6.0
[uav 0]
format r32 float
format r32-float
size (2d, 2, 2)
0.1 0.2
0.3 0.4
[uav 1]
format r32g32b32a32 float
format r32g32b32a32-float
size (2d, 1, 1)
0.5 0.6 0.7 0.8
@ -60,7 +60,7 @@ probe uav 1 (0, 0) rgba (2.0, 1.0, 4.0, 3.0)
[uav 2]
format r32g32b32a32 float
format r32g32b32a32-float
size (2d, 1, 1)
0.1 0.2 0.3 0.4
@ -94,12 +94,12 @@ probe uav 2 (0, 0) rgba (0.9, 0.8, 0.7, 0.6)
% Test that we can declare and use an array of UAVs.
[uav 1]
format r32g32b32a32 float
format r32g32b32a32-float
size (2d, 1, 1)
0.1 0.2 0.3 0.4
[uav 2]
format r32g32b32a32 float
format r32g32b32a32-float
size (2d, 1, 1)
0.5 0.6 0.7 0.8

2
tests/hlsl/static-initializer.shader_test
View File

@ -172,7 +172,7 @@ shader model >= 5.0
[uav 1]
format r32 float
format r32-float
size (2d, 1, 1)
0.5

4
tests/hlsl/struct-semantics.shader_test
View File

@ -1,6 +1,6 @@
[input layout]
0 r32g32b32a32 float texcoord
0 r32g32 float position
0 r32g32b32a32-float texcoord
0 r32g32-float position
[vb 0]
0.0 1.0 0.0 1.0 -2.0 -2.0

6
tests/hlsl/texture-load-typed.shader_test
View File

@ -19,19 +19,19 @@ float4 main() : sv_target
}
[srv 0]
format r32 float
format r32-float
size (2d, 1, 1)
0.8
[srv 1]
format r32 sint
format r32-sint
size (2d, 1, 1)
-3
[srv 2]
format r32g32 uint
format r32g32-uint
size (2d, 1, 1)
4294967295 123

10
tests/hlsl/tgsm.shader_test
View File

@ -2,7 +2,7 @@
shader model >= 5.0
[uav 1]
format r32 typeless
format r32-typeless
size (raw_buffer, 4)
1 0 0 0
@ -32,7 +32,7 @@ probe uav 1 (3) rui (99)
[uav 1]
format r32 typeless
format r32-typeless
size (raw_buffer, 4)
1 0 0 0
@ -62,13 +62,13 @@ probe uav 1 (3) ri (-93)
[uav 1]
format r32 float
format r32-float
size (buffer, 8)
1 1 1 1 0 0 0 0
[uav 2]
format r32 sint
format r32-sint
size (buffer, 8)
1 1 1 1 0 0 0 0
@ -136,7 +136,7 @@ probe uav 2 (7) ri (4)
[uav 1]
format r32 typeless
format r32-typeless
size (raw_buffer, 1)
0

6
tests/hlsl/uav-atomics.shader_test
View File

@ -2,7 +2,7 @@
shader model >= 5.0
[uav 1]
format r32 uint
format r32-uint
size (buffer, 9)
0xd 5 6 0x10 4 4 7 2 0
@ -54,7 +54,7 @@ probe uav 1 (8) rui (1)
[uav 2]
format r32 sint
format r32-sint
size (buffer, 2)
-3 1
@ -84,7 +84,7 @@ probe uav 2 (1) ri (-3)
[uav 1]
format r32 uint
format r32-uint
size (2d, 9, 1)
0xd 5 6 0x10 4 4 7 2 0

4
tests/hlsl/uav-load.shader_test
View File

@ -2,13 +2,13 @@
shader model >= 5.0
[uav 0]
format r32 float
format r32-float
size (2d, 3, 1)
0.1 0.2 0.3
[uav 1]
format r32 float
format r32-float
size (2d, 1, 1)
0.5

4
tests/hlsl/uav-out-param.shader_test
View File

@ -2,7 +2,7 @@
shader model >= 5.0
[uav 0]
format r32g32b32a32 float
format r32g32b32a32-float
size (2d, 1, 1)
0.1 0.2 0.3 0.4
@ -30,7 +30,7 @@ todo(glsl) dispatch 1 1 1
probe uav 0 (0, 0) rgba (0.4, 0.1, 0.2, 0.3)
[uav 0]
format r32 float
format r32-float
size (2d, 1, 1)
0.1

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

@ -7,7 +7,7 @@ shader model >= 5.0
% This ceases to be true with shader model 5.1.
[rtv 1]
format r32g32b32a32 float
format r32g32b32a32-float
size (2d, 640, 480)
[pixel shader]
@ -165,7 +165,7 @@ float4 main() : sv_target1
}
[uav 1]
format r32g32b32a32 sint
format r32g32b32a32-sint
size (buffer, 2)
1 2 3 4 5 6 7 8
@ -185,7 +185,7 @@ probe uav 1 (0) rgbai (11, -12, 13, -14)
probe uav 1 (1) rgbai (-15, 16, -17, 18)
[uav 2]
format r32g32b32a32 float
format r32g32b32a32-float
size (buffer, 1)
0.1 0.2 0.3 0.4

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

@ -2,7 +2,7 @@
shader model >= 5.0
[uav 1]
format r32 typeless
format r32-typeless
size (raw_buffer, 4)
1 2 3 4

14
tests/hlsl/uav-rwtexture.shader_test
View File

@ -25,14 +25,14 @@ float4 main() : sv_target
[uav 1]
format r32 float
format r32-float
size (2d, 2, 2)
0.1 0.2
0.3 0.4
[uav 2]
format r32g32b32a32 float
format r32g32b32a32-float
size (2d, 1, 1)
0.5 0.6 0.7 0.8
@ -65,11 +65,11 @@ probe uav 2 (0, 0) rgba (2.0, 1.0, 4.0, 3.0)
% This ceases to be true with shader model 5.1.
[rtv 1]
format r32g32b32a32 float
format r32g32b32a32-float
size (2d, 640, 480)
[uav 2]
format r32g32b32a32 float
format r32g32b32a32-float
size (2d, 1, 1)
0.1 0.2 0.3 0.4
@ -107,7 +107,7 @@ probe uav 2 (0, 0) rgba (0.9, 0.8, 0.7, 0.6)
[uav 3]
format r32g32b32a32 float
format r32g32b32a32-float
size (2d, 1, 1)
0.1 0.2 0.3 0.4
@ -142,13 +142,13 @@ probe uav 3 (0, 0) rgba (0.9, 0.8, 0.7, 0.6)
% Test that we can declare and use an array of UAVs.
[uav 2]
format r32g32b32a32 float
format r32g32b32a32-float
size (2d, 1, 1)
0.1 0.2 0.3 0.4
[uav 3]
format r32g32b32a32 float
format r32g32b32a32-float
size (2d, 1, 1)
0.5 0.6 0.7 0.8

8
tests/hlsl/wave-ops-float.shader_test
View File

@ -3,7 +3,7 @@ shader model >= 6.0
wave ops
[uav 0]
format r32g32b32a32 float
format r32g32b32a32-float
size (buffer, 4)
3.5 1.0 4.0 2.5
@ -12,7 +12,7 @@ size (buffer, 4)
3.5 1.0 4.5 2.5
[uav 1]
format r32g32b32a32 uint
format r32g32b32a32-uint
size (buffer, 8)
0 0 0 0
@ -86,7 +86,7 @@ probe uav 1 (0) rgbaui (0xb, 0, 0, 0)
[uav 1]
format r32g32b32a32 float
format r32g32b32a32-float
size (buffer, 8)
0 0 0 0
@ -231,7 +231,7 @@ probe uav 1 (3) rgba (42.875, 1.5, 64.0, 15.625)
[uav 0]
format r32g32b32a32 float
format r32g32b32a32-float
size (buffer, 4)
0.25 0.50 0.75 1.00

4
tests/hlsl/wave-ops-int.shader_test
View File

@ -3,7 +3,7 @@ shader model >= 6.0
wave ops
[uav 0]
format r32g32b32a32 sint
format r32g32b32a32-sint
size (buffer, 4)
-3 1 -4 2
@ -12,7 +12,7 @@ size (buffer, 4)
-1 1 -1 2
[uav 1]
format r32g32b32a32 sint
format r32g32b32a32-sint
size (buffer, 4)
0 0 0 0

4
tests/hlsl/wave-ops-uint.shader_test
View File

@ -3,13 +3,13 @@ shader model >= 6.0
wave ops
[uav 0]
format r32 uint
format r32-uint
size (buffer, 4)
8 15 8 10
[uav 1]
format r32 uint
format r32-uint
size (buffer, 8)
0 0 0 0 0 0 0 0

8
tests/hlsl/wave-reconvergence.shader_test
View File

@ -2,19 +2,19 @@
shader model >= 6.0
[uav 0]
format r32 uint
format r32-uint
size (buffer, 4)
0x0 0x1 0x2 0x13
[uav 1]
format r32 uint
format r32-uint
size (buffer, 4)
0x100 0x200 0x400 0x800
[uav 2]
format r32 uint
format r32-uint
size (buffer, 20)
0 0 0 0 0
@ -82,7 +82,7 @@ probe uav 2 (18) rui (0)
probe uav 2 (19) rui (0)
[uav 2]
format r32 uint
format r32-uint
size (buffer, 20)
0 0 0 0 0

22
tests/shader_runner.c
View File

@ -291,17 +291,17 @@ static DXGI_FORMAT parse_format(const char *line, enum texture_data_type *data_t
}
formats[] =
{
{"r32g32b32a32 float", TEXTURE_DATA_FLOAT, 16, DXGI_FORMAT_R32G32B32A32_FLOAT},
{"r32g32b32a32 sint", TEXTURE_DATA_SINT, 16, DXGI_FORMAT_R32G32B32A32_SINT},
{"r32g32b32a32 uint", TEXTURE_DATA_UINT, 16, DXGI_FORMAT_R32G32B32A32_UINT},
{"r32g32 float", TEXTURE_DATA_FLOAT, 8, DXGI_FORMAT_R32G32_FLOAT},
{"r32g32 int", TEXTURE_DATA_SINT, 8, DXGI_FORMAT_R32G32_SINT},
{"r32g32 uint", TEXTURE_DATA_UINT, 8, DXGI_FORMAT_R32G32_UINT},
{"r32 float shadow", TEXTURE_DATA_FLOAT, 4, DXGI_FORMAT_R32_FLOAT, true},
{"r32 float", TEXTURE_DATA_FLOAT, 4, DXGI_FORMAT_R32_FLOAT},
{"r32 sint", TEXTURE_DATA_SINT, 4, DXGI_FORMAT_R32_SINT},
{"r32 uint", TEXTURE_DATA_UINT, 4, DXGI_FORMAT_R32_UINT},
{"r32 typeless", TEXTURE_DATA_UINT, 4, DXGI_FORMAT_R32_TYPELESS},
{"r32g32b32a32-float", TEXTURE_DATA_FLOAT, 16, DXGI_FORMAT_R32G32B32A32_FLOAT},
{"r32g32b32a32-sint", TEXTURE_DATA_SINT, 16, DXGI_FORMAT_R32G32B32A32_SINT},
{"r32g32b32a32-uint", TEXTURE_DATA_UINT, 16, DXGI_FORMAT_R32G32B32A32_UINT},
{"r32g32-float", TEXTURE_DATA_FLOAT, 8, DXGI_FORMAT_R32G32_FLOAT},
{"r32g32-sint", TEXTURE_DATA_SINT, 8, DXGI_FORMAT_R32G32_SINT},
{"r32g32-uint", TEXTURE_DATA_UINT, 8, DXGI_FORMAT_R32G32_UINT},
{"r32-float-shadow", TEXTURE_DATA_FLOAT, 4, DXGI_FORMAT_R32_FLOAT, true},
{"r32-float", TEXTURE_DATA_FLOAT, 4, DXGI_FORMAT_R32_FLOAT},
{"r32-sint", TEXTURE_DATA_SINT, 4, DXGI_FORMAT_R32_SINT},
{"r32-uint", TEXTURE_DATA_UINT, 4, DXGI_FORMAT_R32_UINT},
{"r32-typeless", TEXTURE_DATA_UINT, 4, DXGI_FORMAT_R32_TYPELESS},
};
unsigned int i;