tests/shader-runner: Change resource declaration syntax on shader_test files.

On shader_test files, now resources should be declared this way:

    [texture n]       -> [srv n]
    [srv buffer n]    -> [srv n]
    [uav n]           -> [uav n]
    [uav buffer n]    -> [uav n]
    [vertex buffer n] -> [vb n]
    [render target n] -> [rtv n]

The dimension (buffer or 2D) is now specified as an additional parameter
in the "size" directive:

  For 2D resources:
  size (n, m)         -> size (2d, n, m)

  For buffers:
  size (n, 1)         -> size (buffer, n)
This commit is contained in:
Francisco Casas
2024-01-24 16:11:17 -03:00
committed by Alexandre Julliard
parent 4d855611b7
commit b08be04465
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
38 changed files with 190 additions and 219 deletions

View File

@@ -14,12 +14,12 @@ float4 main() : sv_target
shader model >= 4.0
[texture 0]
size (1, 1)
[srv 0]
size (2d, 1, 1)
0.77 0.77 0.77 0.77
[texture 1]
size (1, 1)
[srv 1]
size (2d, 1, 1)
0.64 0.64 0.64 0.64
[sampler 0]
@@ -50,8 +50,8 @@ draw quad
probe all rgba (77.77, 77.77, 77.77, 77.77)
[texture 0]
size (2, 2)
[srv 0]
size (2d, 2, 2)
0.1 0.2 0.3 0.4 0.5 0.7 0.6 0.8
0.6 0.5 0.2 0.1 0.8 0.0 0.7 1.0
@@ -80,16 +80,16 @@ probe (0, 1) rgba (0.6, 0.5, 0.2, 0.1)
probe (1, 1) rgba (0.8, 0.0, 0.7, 1.0)
[texture 0]
size (1, 1)
[srv 0]
size (2d, 1, 1)
1.0 1.0 1.0 1.0
[texture 1]
size (1, 1)
[srv 1]
size (2d, 1, 1)
2.0 2.0 2.0 1.0
[texture 2]
size (1, 1)
[srv 2]
size (2d, 1, 1)
3.0 3.0 3.0 1.0
[pixel shader]
@@ -219,8 +219,8 @@ float4 main(Texture2D tex2) : sv_target
shader model >= 5.0
[texture 0]
size (1, 1)
[srv 0]
size (2d, 1, 1)
1.0 2.0 3.0 4.0
[pixel shader todo fail(sm>=6)]