wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08: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 shader model >= 4.0
[input layout] [input layout]
0 r32g32b32a32 uint apple 0 r32g32b32a32-uint apple
0 r32g32 int sv_position 0 r32g32-sint sv_position
[vb 0] [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 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 shader model >= 4.0
[input layout] [input layout]
0 r32g32 float POSITION 0 r32g32-float POSITION
1 r32 float CLIP_DISTANCE 1 r32-float CLIP_DISTANCE
[vb 0] [vb 0]
-1.0 -1.0 -1.0 -1.0
@ -18,7 +18,7 @@ shader model >= 4.0
1.0 1.0
[rtv 0] [rtv 0]
format r32g32b32a32 float format r32g32b32a32-float
size (2d, 640, 480) size (2d, 640, 480)
[vertex shader todo] [vertex shader todo]

2
tests/hlsl/compute.shader_test
View File

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

6
tests/hlsl/coverage.shader_test
View File

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

4
tests/hlsl/geometry.shader_test
View File

@ -2,8 +2,8 @@
shader model >= 4.0 shader model >= 4.0
[input layout] [input layout]
0 r32g32b32a32 float SV_POSITION 0 r32g32b32a32-float SV_POSITION
0 r32g32b32a32 float COLOR 0 r32g32b32a32-float COLOR
[vb 0] [vb 0]
0.0 0.0 1.0 1.0 0.0 1.0 1.0 1.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] [srv 0]
format r32g32b32a32 float format r32g32b32a32-float
size (2dms, 4, 2, 2) size (2dms, 4, 2, 2)
[pixel shader todo] [pixel shader todo]

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

@ -2,7 +2,7 @@
shader model >= 4.0 shader model >= 4.0
[input layout] [input layout]
0 r32g32 float sv_position 0 r32g32-float sv_position
[vb 0] [vb 0]
-2.0 -2.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) probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0)
[rtv 0] [rtv 0]
format r32 float format r32-float
size (2d, 640, 480) size (2d, 640, 480)
[rtv 1] [rtv 1]
format r32 float format r32-float
size (2d, 640, 480) size (2d, 640, 480)
[rtv 2] [rtv 2]
format r32 float format r32-float
size (2d, 640, 480) size (2d, 640, 480)
[rtv 3] [rtv 3]
format r32 float format r32-float
size (2d, 640, 480) size (2d, 640, 480)
[pixel shader fail(sm>=6)] [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) probe rtv 3 (0,0) r (6.0)
[rtv 0] [rtv 0]
format r32g32b32a32 float format r32g32b32a32-float
size (2d, 640, 480) size (2d, 640, 480)
[pixel shader fail(sm>=6)] [pixel shader fail(sm>=6)]

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

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

2
tests/hlsl/nointerpolation.shader_test
View File

@ -2,7 +2,7 @@
shader model >= 4.0 shader model >= 4.0
[input layout] [input layout]
0 r32g32b32a32 float texcoord 0 r32g32b32a32-float texcoord
[vb 0] [vb 0]
0.0 1.0 0.0 1.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(); } void main() { func(); }
[uav 0] [uav 0]
format r32 float format r32-float
size (2d, 2, 2) size (2d, 2, 2)
1.0 1.0 1.0 1.0

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

@ -2,15 +2,15 @@
shader model >= 5.0 shader model >= 5.0
[rtv 0] [rtv 0]
format r32 uint format r32-uint
size (2d, 640, 480) size (2d, 640, 480)
[uav 1] [uav 1]
format r32 uint format r32-uint
size (2d, 640, 480) size (2d, 640, 480)
[srv 0] [srv 0]
format r32g32b32a32 uint format r32g32b32a32-uint
size (2d, 1, 1) size (2d, 1, 1)
0 0 0 0 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] [rtv 0]
format r32g32b32a32 float format r32g32b32a32-float
size (2dms, 4, 640, 480) size (2dms, 4, 640, 480)
[pixel shader] [pixel shader]

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

@ -7,7 +7,7 @@ address clamp clamp clamp
comparison never comparison never
[srv 0] [srv 0]
format r32 float shadow format r32-float-shadow
size (2d, 2, 2) size (2d, 2, 2)
0.5 0.5 0.5 0.5
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 shader model >= 4.0
[input layout] [input layout]
0 r32g32 float SV_POSITION 0 r32g32-float SV_POSITION
0 r32g32 float TEXCOORD 0 0 r32g32-float TEXCOORD 0
0 r32 float TEXCOORD 1 0 r32-float TEXCOORD 1
1 r32 uint TEXCOORD 2 1 r32-uint TEXCOORD 2
1 r32 uint TEXCOORD 3 1 r32-uint TEXCOORD 3
0 r32 float TEXCOORD 4 0 r32-float TEXCOORD 4
[vb 0] [vb 0]
-1.0 -1.0 3.0 5.0 5.0 7.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 1.0 1.0 3.0 5.0 5.0 7.0
[vb 1] [vb 1]
format r32 uint format r32-uint
2 6 2 6
2 6 2 6
2 6 2 6

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

@ -2,13 +2,13 @@
shader model >= 6.0 shader model >= 6.0
[uav 0] [uav 0]
format r32 float format r32-float
size (2d, 2, 2) size (2d, 2, 2)
0.1 0.2 0.1 0.2
0.3 0.4 0.3 0.4
[uav 1] [uav 1]
format r32g32b32a32 float format r32g32b32a32-float
size (2d, 1, 1) size (2d, 1, 1)
0.5 0.6 0.7 0.8 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] [uav 2]
format r32g32b32a32 float format r32g32b32a32-float
size (2d, 1, 1) size (2d, 1, 1)
0.1 0.2 0.3 0.4 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. % Test that we can declare and use an array of UAVs.
[uav 1] [uav 1]
format r32g32b32a32 float format r32g32b32a32-float
size (2d, 1, 1) size (2d, 1, 1)
0.1 0.2 0.3 0.4 0.1 0.2 0.3 0.4
[uav 2] [uav 2]
format r32g32b32a32 float format r32g32b32a32-float
size (2d, 1, 1) size (2d, 1, 1)
0.5 0.6 0.7 0.8 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] [uav 1]
format r32 float format r32-float
size (2d, 1, 1) size (2d, 1, 1)
0.5 0.5

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

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

Some files were not shown because too many files have changed in this diff Show More