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)

tests/hlsl/bool-semantics.shader_test

@@ -5,7 +5,7 @@ shader model >= 4.0
 0 r32g32b32a32 uint apple
 0 r32g32 int sv_position
 
-[vertex buffer 0]
+[vb 0]
 format r32 uint
 0 1 0x80000000 0xffffffff   -2 -2
 0 1 0x80000000 0xffffffff   -2  2

tests/hlsl/cbuffer.shader_test

@@ -471,8 +471,8 @@ float4 main() : sv_target
 }
 
 
-[texture 0]
-size (1, 1)
+[srv 0]
+size (2d, 1, 1)
 0.0 0.0 0.0 4.0
 
 [sampler 0]
@@ -527,12 +527,12 @@ float4 main() : sv_target
 }
 
 
-[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 2.0
 
 
@@ -698,8 +698,8 @@ float4 main() : sv_target
 [require]
 shader model >= 5.0
 
-[texture 0]
-size (1, 1)
+[srv 0]
+size (2d, 1, 1)
 0.0 0.0 0.0 0.5
 
 [pixel shader]

tests/hlsl/combined-samplers.shader_test

@@ -16,24 +16,24 @@ address clamp clamp clamp
 filter linear linear linear
 address clamp clamp clamp
 
-[texture 0]
-size (1, 1)
+[srv 0]
+size (2d, 1, 1)
 0.0 0.0 0.0 1.0
 
-[texture 1]
-size (1, 1)
+[srv 1]
+size (2d, 1, 1)
 1.0 1.0 1.0 1.0
 
-[texture 2]
-size (1, 1)
+[srv 2]
+size (2d, 1, 1)
 2.0 2.0 2.0 1.0
 
-[texture 3]
-size (1, 1)
+[srv 3]
+size (2d, 1, 1)
 3.0 3.0 3.0 1.0
 
-[texture 4]
-size (1, 1)
+[srv 4]
+size (2d, 1, 1)
 4.0 4.0 4.0 1.0
 
 [pixel shader]

tests/hlsl/compute.shader_test

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

tests/hlsl/gather-offset.shader_test

@@ -6,8 +6,8 @@ shader model >= 4.1
 filter linear linear linear
 address clamp clamp clamp
 
-[texture 0]
-size (3, 3)
+[srv 0]
+size (2d, 3, 3)
 0.0 0.0 0.0 0.4     0.1 0.0 0.5 0.0     0.2 0.0 0.0 0.4
 0.0 0.1 0.5 0.0     0.1 0.1 0.0 0.4     0.2 0.1 0.5 0.0
 0.0 0.2 0.0 0.4     0.1 0.2 0.5 0.0     0.2 0.2 0.0 0.4

tests/hlsl/gather.shader_test

@@ -6,8 +6,8 @@ shader model >= 4.1
 filter linear linear linear
 address clamp clamp clamp
 
-[texture 0]
-size (3, 3)
+[srv 0]
+size (2d, 3, 3)
 0.0 0.0 0.0 0.4     0.1 0.0 0.5 0.0     0.2 0.0 0.0 0.4
 0.0 0.1 0.5 0.0     0.1 0.1 0.0 0.4     0.2 0.1 0.5 0.0
 0.0 0.2 0.0 0.4     0.1 0.2 0.5 0.0     0.2 0.2 0.0 0.4

tests/hlsl/getdimensions.shader_test

@@ -1,8 +1,8 @@
 [require]
 shader model >= 4.0
 
-[texture 0]
-size (2, 3)
+[srv 0]
+size (2d, 2, 3)
 
 1.0 0.0 1.0 0.0     1.0 0.0 1.0 0.0     1.0 0.0 1.0 0.0
 1.0 0.0 1.0 0.0     1.0 0.0 1.0 0.0     1.0 0.0 1.0 0.0
@@ -31,8 +31,8 @@ float4 main() : sv_target
 todo(sm>=6) draw quad
 probe all rgba (2.0, 3.0, 2.0, 3.0)
 
-[texture 1]
-size (2, 2)
+[srv 1]
+size (2d, 2, 2)
 levels 2
 
 1.0 0.0 1.0 0.0     1.0 0.0 1.0 0.0

tests/hlsl/initializer-objects.shader_test

@@ -1,14 +1,14 @@
 [require]
 shader model >= 4.0
 
-[texture 0]
-size (3, 3)
+[srv 0]
+size (2d, 3, 3)
 0.1 0.1 0.1 0.1     0.2 0.2 0.2 0.2     0.3 0.3 0.3 0.3
 0.4 0.4 0.4 0.4     0.5 0.5 0.5 0.5     0.6 0.6 0.6 0.6
 0.7 0.7 0.7 0.7     0.8 0.8 0.8 0.8     0.9 0.9 0.9 0.9
 
-[texture 1]
-size (2, 2)
+[srv 1]
+size (2d, 2, 2)
 0.1 0.1 0.1 0.0     0.2 0.2 0.2 0.0
 0.4 0.4 0.4 0.0     0.5 0.5 0.5 0.0
 

tests/hlsl/is-front-face.shader_test

@@ -4,7 +4,7 @@ shader model >= 4.0
 [input layout]
 0 r32g32 float sv_position
 
-[vertex buffer 0]
+[vb 0]
 -2.0 -2.0
  2.0 -2.0
 -2.0  2.0
@@ -25,7 +25,7 @@ float4 main(bool face : sv_isfrontface) : sv_target
 draw triangle strip 4
 probe all rgba (0.0, 1.0, 0.0, 1.0)
 
-[vertex buffer 0]
+[vb 0]
 -2.0 -2.0
 -2.0  2.0
  2.0 -2.0

tests/hlsl/load-level.shader_test

@@ -1,8 +1,8 @@
 [require]
 shader model >= 4.0
 
-[texture 0]
-size (2, 2)
+[srv 0]
+size (2d, 2, 2)
 levels 2
 
 1.0 0.0 1.0 0.0     1.0 0.0 1.0 0.0

tests/hlsl/matrix-semantics.shader_test

@@ -21,21 +21,21 @@ row_major float1x4 main() : sv_target
 draw quad
 probe all rgba (1.0, 2.0, 3.0, 4.0)
 
-[render target 0]
+[rtv 0]
 format r32 float
-size (640, 480)
+size (2d, 640, 480)
 
-[render target 1]
+[rtv 1]
 format r32 float
-size (640, 480)
+size (2d, 640, 480)
 
-[render target 2]
+[rtv 2]
 format r32 float
-size (640, 480)
+size (2d, 640, 480)
 
-[render target 3]
+[rtv 3]
 format r32 float
-size (640, 480)
+size (2d, 640, 480)
 
 [pixel shader fail(sm>=6)]
 row_major float4x1 main() : sv_target
@@ -84,9 +84,9 @@ probe render target 1 all r (2.0)
 probe render target 2 all r (5.0)
 probe render target 3 all r (6.0)
 
-[render target 0]
+[rtv 0]
 format r32g32b32a32 float
-size (640, 480)
+size (2d, 640, 480)
 
 [pixel shader fail(sm>=6)]
 void main(out row_major float1x4 x : sv_target0, out float1x2 y : sv_target1)

tests/hlsl/multiple-rt.shader_test

@@ -1,10 +1,10 @@
-[render target 0]
+[rtv 0]
 format r32g32b32a32 float
-size (640, 480)
+size (2d, 640, 480)
 
-[render target 1]
+[rtv 1]
 format r32g32b32a32 float
-size (640, 480)
+size (2d, 640, 480)
 
 [pixel shader]
 void main(out float4 o0 : sv_target0, out float4 o1 : sv_target1)

tests/hlsl/nointerpolation.shader_test

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

tests/hlsl/numthreads.shader_test

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

tests/hlsl/object-parameters.shader_test

@@ -48,33 +48,33 @@ float4 main(struct apple input, uniform float param) : sv_target
 }
 
 
-[texture 0]
-size (2, 2)
+[srv 0]
+size (2d, 2, 2)
 1.0 1.0 1.0 1.0     0.0 0.0 0.0 1.0
 1.0 1.0 1.0 1.0     0.0 0.0 0.0 1.0
 
-[texture 1]
-size (2, 2)
+[srv 1]
+size (2d, 2, 2)
 2.0 2.0 2.0 1.0     0.0 0.0 0.0 1.0
 2.0 2.0 2.0 1.0     0.0 0.0 0.0 1.0
 
-[texture 2]
-size (2, 2)
+[srv 2]
+size (2d, 2, 2)
 3.0 3.0 3.0 1.0     0.0 0.0 0.0 1.0
 3.0 3.0 3.0 1.0     0.0 0.0 0.0 1.0
 
-[texture 3]
-size (2, 2)
+[srv 3]
+size (2d, 2, 2)
 4.0 4.0 4.0 1.0     0.0 0.0 0.0 1.0
 4.0 4.0 4.0 1.0     0.0 0.0 0.0 1.0
 
-[texture 4]
-size (2, 2)
+[srv 4]
+size (2d, 2, 2)
 5.0 5.0 5.0 1.0     0.0 0.0 0.0 1.0
 5.0 5.0 5.0 1.0     0.0 0.0 0.0 1.0
 
-[texture 5]
-size (2, 2)
+[srv 5]
+size (2d, 2, 2)
 6.0 6.0 6.0 1.0     0.0 0.0 0.0 1.0
 6.0 6.0 6.0 1.0     0.0 0.0 0.0 1.0
 

tests/hlsl/object-references.shader_test

@@ -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)]

tests/hlsl/rasteriser-ordered-views.shader_test

@@ -1,17 +1,17 @@
 [require]
 shader model >= 5.0
 
-[render target 0]
+[rtv 0]
 format r32 uint
-size (640, 480)
+size (2d, 640, 480)
 
 [uav 1]
 format r32 uint
-size (640, 480)
+size (2d, 640, 480)
 
-[texture 0]
+[srv 0]
 format r32g32b32a32 uint
-size (1, 1)
+size (2d, 1, 1)
 0 0 0 0
 
 [vertex shader]

tests/hlsl/register-reservations-resources.shader_test

@@ -2,24 +2,24 @@
 shader model >= 4.0
 
 
-[texture 0]
-size (1, 1)
+[srv 0]
+size (2d, 1, 1)
 0.0 0.0 0.0 99.0
 
-[texture 1]
-size (1, 1)
+[srv 1]
+size (2d, 1, 1)
 1.0 1.0 1.0 99.0
 
-[texture 2]
-size (1, 1)
+[srv 2]
+size (2d, 1, 1)
 2.0 2.0 2.0 99.0
 
-[texture 3]
-size (1, 1)
+[srv 3]
+size (2d, 1, 1)
 3.0 3.0 3.0 99.0
 
-[texture 4]
-size (1, 1)
+[srv 4]
+size (2d, 1, 1)
 4.0 4.0 4.0 99.0
 
 
@@ -175,15 +175,15 @@ probe all rgba (2.0, 2.0, 2.0, 99.0)
 [require]
 shader model >= 5.0
 
-[texture 0]
-size (2, 2)
+[srv 0]
+size (2d, 2, 2)
 0.0 0.0 0.0 99.0
 0.0 0.0 0.0 99.0
 0.0 0.0 0.0 99.0
 0.0 0.0 0.0 99.0
 
-[texture 1]
-size (2, 2)
+[srv 1]
+size (2d, 2, 2)
 1.0 1.0 1.0 99.0
 1.0 1.0 1.0 99.0
 0.0 0.0 0.0 99.0

tests/hlsl/sample-bias.shader_test

@@ -2,8 +2,8 @@
 filter linear linear linear
 address clamp clamp clamp
 
-[texture 0]
-size (2, 2)
+[srv 0]
+size (2d, 2, 2)
 levels 2
 
 1.0 0.0 1.0 0.0     1.0 0.0 1.0 0.0

tests/hlsl/sample-grad.shader_test

@@ -5,8 +5,8 @@ shader model >= 4.0
 filter linear linear linear
 address clamp clamp clamp
 
-[texture 0]
-size (2, 2)
+[srv 0]
+size (2d, 2, 2)
 levels 2
 
 1.0 0.0 1.0 0.0     1.0 0.0 1.0 0.0