From 19c23ca6f23ca14640a54190ba12459a19164176 Mon Sep 17 00:00:00 2001 From: Francisco Casas Date: Thu, 1 Aug 2024 21:03:46 -0400 Subject: [PATCH] tests/shader_runner: Replace spaces with dashes in format names. 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". --- tests/hlsl/bool-semantics.shader_test | 6 ++--- tests/hlsl/clip-distance.shader_test | 6 ++--- tests/hlsl/compute.shader_test | 2 +- tests/hlsl/coverage.shader_test | 6 ++--- tests/hlsl/depth-out.shader_test | 2 +- tests/hlsl/discard.shader_test | 2 +- tests/hlsl/geometry.shader_test | 4 ++-- tests/hlsl/get-sample-pos.shader_test | 2 +- tests/hlsl/is-front-face.shader_test | 2 +- tests/hlsl/matrix-semantics.shader_test | 10 ++++----- tests/hlsl/multiple-rt.shader_test | 4 ++-- tests/hlsl/nointerpolation.shader_test | 2 +- tests/hlsl/numthreads.shader_test | 2 +- .../hlsl/rasteriser-ordered-views.shader_test | 6 ++--- tests/hlsl/rt-get-sample-info.shader_test | 2 +- tests/hlsl/sample-cmp.shader_test | 2 +- .../shader-interstage-interface.shader_test | 14 ++++++------ tests/hlsl/sm6-uav-rwtexture.shader_test | 10 ++++----- tests/hlsl/static-initializer.shader_test | 2 +- tests/hlsl/struct-semantics.shader_test | 4 ++-- tests/hlsl/texture-load-typed.shader_test | 6 ++--- tests/hlsl/tgsm.shader_test | 10 ++++----- tests/hlsl/uav-atomics.shader_test | 6 ++--- tests/hlsl/uav-load.shader_test | 4 ++-- tests/hlsl/uav-out-param.shader_test | 4 ++-- tests/hlsl/uav-rwbuffer.shader_test | 6 ++--- .../hlsl/uav-rwbyteaddressbuffer.shader_test | 2 +- tests/hlsl/uav-rwtexture.shader_test | 14 ++++++------ tests/hlsl/wave-ops-float.shader_test | 8 +++---- tests/hlsl/wave-ops-int.shader_test | 4 ++-- tests/hlsl/wave-ops-uint.shader_test | 4 ++-- tests/hlsl/wave-reconvergence.shader_test | 8 +++---- tests/shader_runner.c | 22 +++++++++---------- 33 files changed, 94 insertions(+), 94 deletions(-) diff --git a/tests/hlsl/bool-semantics.shader_test b/tests/hlsl/bool-semantics.shader_test index 1b956378..67bdfb56 100644 --- a/tests/hlsl/bool-semantics.shader_test +++ b/tests/hlsl/bool-semantics.shader_test @@ -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 diff --git a/tests/hlsl/clip-distance.shader_test b/tests/hlsl/clip-distance.shader_test index ec5cec23..842d25d7 100644 --- a/tests/hlsl/clip-distance.shader_test +++ b/tests/hlsl/clip-distance.shader_test @@ -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] diff --git a/tests/hlsl/compute.shader_test b/tests/hlsl/compute.shader_test index 9a0c1b46..379bd12a 100644 --- a/tests/hlsl/compute.shader_test +++ b/tests/hlsl/compute.shader_test @@ -2,7 +2,7 @@ shader model >= 5.0 [uav 0] -format r32 float +format r32-float size (2d, 1, 1) 0.1 diff --git a/tests/hlsl/coverage.shader_test b/tests/hlsl/coverage.shader_test index 661af77c..c7b3c01a 100644 --- a/tests/hlsl/coverage.shader_test +++ b/tests/hlsl/coverage.shader_test @@ -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 diff --git a/tests/hlsl/depth-out.shader_test b/tests/hlsl/depth-out.shader_test index 998ea2e7..7841f735 100644 --- a/tests/hlsl/depth-out.shader_test +++ b/tests/hlsl/depth-out.shader_test @@ -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] diff --git a/tests/hlsl/discard.shader_test b/tests/hlsl/discard.shader_test index 92dfb233..0da6d256 100644 --- a/tests/hlsl/discard.shader_test +++ b/tests/hlsl/discard.shader_test @@ -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 diff --git a/tests/hlsl/geometry.shader_test b/tests/hlsl/geometry.shader_test index c99b8f8b..b59f693c 100644 --- a/tests/hlsl/geometry.shader_test +++ b/tests/hlsl/geometry.shader_test @@ -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 diff --git a/tests/hlsl/get-sample-pos.shader_test b/tests/hlsl/get-sample-pos.shader_test index a910380b..04b1aa13 100644 --- a/tests/hlsl/get-sample-pos.shader_test +++ b/tests/hlsl/get-sample-pos.shader_test @@ -3,7 +3,7 @@ shader model >= 4.1 [srv 0] -format r32g32b32a32 float +format r32g32b32a32-float size (2dms, 4, 2, 2) [pixel shader todo] diff --git a/tests/hlsl/is-front-face.shader_test b/tests/hlsl/is-front-face.shader_test index f6ab5b63..f52b456e 100644 --- a/tests/hlsl/is-front-face.shader_test +++ b/tests/hlsl/is-front-face.shader_test @@ -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 diff --git a/tests/hlsl/matrix-semantics.shader_test b/tests/hlsl/matrix-semantics.shader_test index fd7f5534..6ea84251 100644 --- a/tests/hlsl/matrix-semantics.shader_test +++ b/tests/hlsl/matrix-semantics.shader_test @@ -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)] diff --git a/tests/hlsl/multiple-rt.shader_test b/tests/hlsl/multiple-rt.shader_test index a9245be7..61dc7df8 100644 --- a/tests/hlsl/multiple-rt.shader_test +++ b/tests/hlsl/multiple-rt.shader_test @@ -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] diff --git a/tests/hlsl/nointerpolation.shader_test b/tests/hlsl/nointerpolation.shader_test index 17f25797..13901f23 100644 --- a/tests/hlsl/nointerpolation.shader_test +++ b/tests/hlsl/nointerpolation.shader_test @@ -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 diff --git a/tests/hlsl/numthreads.shader_test b/tests/hlsl/numthreads.shader_test index da336967..89b979c5 100644 --- a/tests/hlsl/numthreads.shader_test +++ b/tests/hlsl/numthreads.shader_test @@ -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 diff --git a/tests/hlsl/rasteriser-ordered-views.shader_test b/tests/hlsl/rasteriser-ordered-views.shader_test index c23ae048..7672fca3 100644 --- a/tests/hlsl/rasteriser-ordered-views.shader_test +++ b/tests/hlsl/rasteriser-ordered-views.shader_test @@ -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 diff --git a/tests/hlsl/rt-get-sample-info.shader_test b/tests/hlsl/rt-get-sample-info.shader_test index 4168e769..1cf8e2f9 100644 --- a/tests/hlsl/rt-get-sample-info.shader_test +++ b/tests/hlsl/rt-get-sample-info.shader_test @@ -3,7 +3,7 @@ shader model >= 4.1 [rtv 0] -format r32g32b32a32 float +format r32g32b32a32-float size (2dms, 4, 640, 480) [pixel shader] diff --git a/tests/hlsl/sample-cmp.shader_test b/tests/hlsl/sample-cmp.shader_test index 0546d793..1b76aceb 100644 --- a/tests/hlsl/sample-cmp.shader_test +++ b/tests/hlsl/sample-cmp.shader_test @@ -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 diff --git a/tests/hlsl/shader-interstage-interface.shader_test b/tests/hlsl/shader-interstage-interface.shader_test index 099bcc4a..d678e7ac 100644 --- a/tests/hlsl/shader-interstage-interface.shader_test +++ b/tests/hlsl/shader-interstage-interface.shader_test @@ -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 diff --git a/tests/hlsl/sm6-uav-rwtexture.shader_test b/tests/hlsl/sm6-uav-rwtexture.shader_test index 8eb73382..7f8c88e3 100644 --- a/tests/hlsl/sm6-uav-rwtexture.shader_test +++ b/tests/hlsl/sm6-uav-rwtexture.shader_test @@ -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 diff --git a/tests/hlsl/static-initializer.shader_test b/tests/hlsl/static-initializer.shader_test index fc736807..54934847 100644 --- a/tests/hlsl/static-initializer.shader_test +++ b/tests/hlsl/static-initializer.shader_test @@ -172,7 +172,7 @@ shader model >= 5.0 [uav 1] -format r32 float +format r32-float size (2d, 1, 1) 0.5 diff --git a/tests/hlsl/struct-semantics.shader_test b/tests/hlsl/struct-semantics.shader_test index 3698f599..8d0d6f2d 100644 --- a/tests/hlsl/struct-semantics.shader_test +++ b/tests/hlsl/struct-semantics.shader_test @@ -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 diff --git a/tests/hlsl/texture-load-typed.shader_test b/tests/hlsl/texture-load-typed.shader_test index eef74e43..7531ca66 100644 --- a/tests/hlsl/texture-load-typed.shader_test +++ b/tests/hlsl/texture-load-typed.shader_test @@ -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 diff --git a/tests/hlsl/tgsm.shader_test b/tests/hlsl/tgsm.shader_test index a4213597..51e89d9b 100644 --- a/tests/hlsl/tgsm.shader_test +++ b/tests/hlsl/tgsm.shader_test @@ -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 diff --git a/tests/hlsl/uav-atomics.shader_test b/tests/hlsl/uav-atomics.shader_test index 1a025d45..860351eb 100644 --- a/tests/hlsl/uav-atomics.shader_test +++ b/tests/hlsl/uav-atomics.shader_test @@ -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 diff --git a/tests/hlsl/uav-load.shader_test b/tests/hlsl/uav-load.shader_test index d49a9b72..85857780 100644 --- a/tests/hlsl/uav-load.shader_test +++ b/tests/hlsl/uav-load.shader_test @@ -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 diff --git a/tests/hlsl/uav-out-param.shader_test b/tests/hlsl/uav-out-param.shader_test index 38e6bec9..7169ec03 100644 --- a/tests/hlsl/uav-out-param.shader_test +++ b/tests/hlsl/uav-out-param.shader_test @@ -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 diff --git a/tests/hlsl/uav-rwbuffer.shader_test b/tests/hlsl/uav-rwbuffer.shader_test index a094e678..d699effc 100644 --- a/tests/hlsl/uav-rwbuffer.shader_test +++ b/tests/hlsl/uav-rwbuffer.shader_test @@ -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 diff --git a/tests/hlsl/uav-rwbyteaddressbuffer.shader_test b/tests/hlsl/uav-rwbyteaddressbuffer.shader_test index 9ac3b43c..7344ec43 100644 --- a/tests/hlsl/uav-rwbyteaddressbuffer.shader_test +++ b/tests/hlsl/uav-rwbyteaddressbuffer.shader_test @@ -2,7 +2,7 @@ shader model >= 5.0 [uav 1] -format r32 typeless +format r32-typeless size (raw_buffer, 4) 1 2 3 4 diff --git a/tests/hlsl/uav-rwtexture.shader_test b/tests/hlsl/uav-rwtexture.shader_test index ef3dffd7..7bdd563c 100644 --- a/tests/hlsl/uav-rwtexture.shader_test +++ b/tests/hlsl/uav-rwtexture.shader_test @@ -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 diff --git a/tests/hlsl/wave-ops-float.shader_test b/tests/hlsl/wave-ops-float.shader_test index e6a916cb..a4e48390 100644 --- a/tests/hlsl/wave-ops-float.shader_test +++ b/tests/hlsl/wave-ops-float.shader_test @@ -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 diff --git a/tests/hlsl/wave-ops-int.shader_test b/tests/hlsl/wave-ops-int.shader_test index bc6976ba..b3dd51c0 100644 --- a/tests/hlsl/wave-ops-int.shader_test +++ b/tests/hlsl/wave-ops-int.shader_test @@ -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 diff --git a/tests/hlsl/wave-ops-uint.shader_test b/tests/hlsl/wave-ops-uint.shader_test index 0be5cdf6..f2b7dd9c 100644 --- a/tests/hlsl/wave-ops-uint.shader_test +++ b/tests/hlsl/wave-ops-uint.shader_test @@ -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 diff --git a/tests/hlsl/wave-reconvergence.shader_test b/tests/hlsl/wave-reconvergence.shader_test index 0a1da3ee..a5a4c3f6 100644 --- a/tests/hlsl/wave-reconvergence.shader_test +++ b/tests/hlsl/wave-reconvergence.shader_test @@ -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 diff --git a/tests/shader_runner.c b/tests/shader_runner.c index f070bb3c..10e64585 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -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;