diff options
Diffstat (limited to 'tests/compute')
105 files changed, 185 insertions, 186 deletions
diff --git a/tests/compute/array-param.slang b/tests/compute/array-param.slang index a5c6bdcca..f1b06b352 100644 --- a/tests/compute/array-param.slang +++ b/tests/compute/array-param.slang @@ -4,7 +4,7 @@ //TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name outputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer RWStructuredBuffer<int> outputBuffer; void writeArray(inout float3 a[4]) diff --git a/tests/compute/assoctype-complex.slang b/tests/compute/assoctype-complex.slang index 29df5310a..57b3b1b7f 100644 --- a/tests/compute/assoctype-complex.slang +++ b/tests/compute/assoctype-complex.slang @@ -1,7 +1,7 @@ //TEST(compute):COMPARE_COMPUTE: -cpu //TEST(compute):COMPARE_COMPUTE: -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<int> outputBuffer; interface IBase diff --git a/tests/compute/assoctype-func-param.slang b/tests/compute/assoctype-func-param.slang index 573016e4b..850b1f8f8 100644 --- a/tests/compute/assoctype-func-param.slang +++ b/tests/compute/assoctype-func-param.slang @@ -3,7 +3,7 @@ // Test type checking of associatedtype and typedef -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<float> outputBuffer; interface IBase diff --git a/tests/compute/assoctype-generic-arg.slang b/tests/compute/assoctype-generic-arg.slang index ae14380f4..c46712336 100644 --- a/tests/compute/assoctype-generic-arg.slang +++ b/tests/compute/assoctype-generic-arg.slang @@ -3,7 +3,7 @@ //TEST_INPUT:type AssocImpl -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<float> outputBuffer; interface IBase diff --git a/tests/compute/assoctype-nested.slang b/tests/compute/assoctype-nested.slang index 6f267a780..af35839eb 100644 --- a/tests/compute/assoctype-nested.slang +++ b/tests/compute/assoctype-nested.slang @@ -49,7 +49,7 @@ int test(int val) return helper(strategy, val); } -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=gOutputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=gOutputBuffer RWStructuredBuffer<int> gOutputBuffer; [numthreads(4, 1, 1)] diff --git a/tests/compute/assoctype-simple.slang b/tests/compute/assoctype-simple.slang index 6edf46f33..4cdd148b7 100644 --- a/tests/compute/assoctype-simple.slang +++ b/tests/compute/assoctype-simple.slang @@ -4,7 +4,7 @@ // Confirm that generics syntax can be used in user // code and generates valid output. -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<float> outputBuffer; interface ISimple diff --git a/tests/compute/atomics-buffer.slang b/tests/compute/atomics-buffer.slang index 92f00272d..32b9e7bbc 100644 --- a/tests/compute/atomics-buffer.slang +++ b/tests/compute/atomics-buffer.slang @@ -7,7 +7,7 @@ // //TEST_DISABLED(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -//TEST_INPUT:ubuffer(format=R_UInt32, data=[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0]):dxbinding(0),glbinding(0),out +//TEST_INPUT:ubuffer(format=R_UInt32, data=[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0]):out RWBuffer<uint> outputBuffer; diff --git a/tests/compute/atomics-groupshared.slang b/tests/compute/atomics-groupshared.slang index 4b86e1b9e..e7ebb2269 100644 --- a/tests/compute/atomics-groupshared.slang +++ b/tests/compute/atomics-groupshared.slang @@ -3,7 +3,7 @@ //TEST(compute):COMPARE_COMPUTE_EX:-slang -compute //TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out RWStructuredBuffer<uint> outputBuffer; diff --git a/tests/compute/atomics.slang b/tests/compute/atomics.slang index b769be5d7..dc81e8a09 100644 --- a/tests/compute/atomics.slang +++ b/tests/compute/atomics.slang @@ -3,7 +3,7 @@ //TEST(compute):COMPARE_COMPUTE_EX:-slang -compute //TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out RWStructuredBuffer<uint> outputBuffer; diff --git a/tests/compute/bit-cast-double.slang b/tests/compute/bit-cast-double.slang index 69c93ba4f..6b0925a58 100644 --- a/tests/compute/bit-cast-double.slang +++ b/tests/compute/bit-cast-double.slang @@ -3,7 +3,7 @@ //TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 //TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<int> outputBuffer; [numthreads(4, 1, 1)] diff --git a/tests/compute/bit-cast.slang b/tests/compute/bit-cast.slang index 9859cc568..a8fec61e3 100644 --- a/tests/compute/bit-cast.slang +++ b/tests/compute/bit-cast.slang @@ -3,7 +3,7 @@ //TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 //TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0 0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name outputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0 0 0 0 0], stride=4):out,name outputBuffer RWStructuredBuffer<int> outputBuffer; diff --git a/tests/compute/break-stmt.slang b/tests/compute/break-stmt.slang index 283593ee5..57521f217 100644 --- a/tests/compute/break-stmt.slang +++ b/tests/compute/break-stmt.slang @@ -15,7 +15,7 @@ int test(int inVal) return -ii; } -//TEST_INPUT:ubuffer(data=[0 1 2 3], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0 1 2 3], stride=4):out,name=outputBuffer RWStructuredBuffer<int> outputBuffer : register(u0); [numthreads(4, 1, 1)] diff --git a/tests/compute/buffer-layout.slang b/tests/compute/buffer-layout.slang index 9e4a63722..a846ce366 100644 --- a/tests/compute/buffer-layout.slang +++ b/tests/compute/buffer-layout.slang @@ -8,7 +8,7 @@ //TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute //TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -cpu -//TEST_INPUT: ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT: ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<int> outputBuffer; struct A @@ -103,10 +103,10 @@ struct S int d; } -//TEST_INPUT:cbuffer(data=[0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32]):dxbinding(0),glbinding(0),name=cb +//TEST_INPUT:cbuffer(data=[0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32]):name=cb ConstantBuffer<S> cb; -//TEST_INPUT:ubuffer(data=[0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32],stride=4):dxbinding(0),glbinding(1),name=sb +//TEST_INPUT:ubuffer(data=[0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32],stride=4):name=sb RWStructuredBuffer<S> sb; int test(int val) diff --git a/tests/compute/buffer-type-splitting.slang b/tests/compute/buffer-type-splitting.slang index f4a05c8f8..f1b74f7ce 100644 --- a/tests/compute/buffer-type-splitting.slang +++ b/tests/compute/buffer-type-splitting.slang @@ -1,11 +1,11 @@ //TEST(compute):COMPARE_COMPUTE:-cpu //TEST(compute):COMPARE_COMPUTE: -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer -//TEST_INPUT:ubuffer(data=[0 2 3 3]):dxbinding(1),glbinding(1),name=s[0].a -//TEST_INPUT:ubuffer(data=[4 5 6 7]):dxbinding(2),glbinding(2),name=s[1].a -//TEST_INPUT:ubuffer(data=[8 9 10 11]):dxbinding(3),glbinding(3),name=s[0].b -//TEST_INPUT:ubuffer(data=[12 13 14 15]):dxbinding(4),glbinding(4),name=s[1].b +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0 2 3 3]):name=s[0].a +//TEST_INPUT:ubuffer(data=[4 5 6 7]):name=s[1].a +//TEST_INPUT:ubuffer(data=[8 9 10 11]):name=s[0].b +//TEST_INPUT:ubuffer(data=[12 13 14 15]):name=s[1].b RWStructuredBuffer<int> outputBuffer; diff --git a/tests/compute/byte-address-buffer.slang b/tests/compute/byte-address-buffer.slang index 851e06214..f2078b52d 100644 --- a/tests/compute/byte-address-buffer.slang +++ b/tests/compute/byte-address-buffer.slang @@ -10,10 +10,10 @@ // TODO: I'm only using `RWByteAddressBuffer` for now because I don't // know if `render-test` supports the non-UAV case. -//TEST_INPUT:ubuffer(data=[0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15]):dxbinding(0),glbinding(0),name=inputBuffer +//TEST_INPUT:ubuffer(data=[0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15]):name=inputBuffer RWByteAddressBuffer inputBuffer; -//TEST_INPUT:ubuffer(data=[0 0 0 0]):dxbinding(1),glbinding(1),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0]):out,name=outputBuffer RWByteAddressBuffer outputBuffer; void test(int val) diff --git a/tests/compute/cast-zero-to-struct.slang b/tests/compute/cast-zero-to-struct.slang index 41bc299e5..ec3dd6472 100644 --- a/tests/compute/cast-zero-to-struct.slang +++ b/tests/compute/cast-zero-to-struct.slang @@ -25,7 +25,7 @@ int test(int val) return t.x + t.y*16; } -//TEST_INPUT: ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=gOutputBuffer +//TEST_INPUT: ubuffer(data=[0 0 0 0], stride=4):out,name=gOutputBuffer RWStructuredBuffer<int> gOutputBuffer; [numthreads(4, 1, 1)] diff --git a/tests/compute/cbuffer-legalize.slang b/tests/compute/cbuffer-legalize.slang index 009876ff7..bbb08b565 100644 --- a/tests/compute/cbuffer-legalize.slang +++ b/tests/compute/cbuffer-legalize.slang @@ -1,10 +1,10 @@ //TEST(compute):COMPARE_COMPUTE:-cpu //TEST(compute):COMPARE_COMPUTE: -//TEST_INPUT:cbuffer(data=[1 2 3 4]):dxbinding(0),glbinding(0),name=C.p.c -//TEST_INPUT:Texture2D(size=4, content = one) : dxbinding(0),glbinding(0),name=C.p.t -//TEST_INPUT: Sampler : dxbinding(0),glbinding(0,1,2,3,4,5,6),name=C.p.s -//TEST_INPUT: ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT:cbuffer(data=[1 2 3 4]):name=C.p.c +//TEST_INPUT:Texture2D(size=4, content = one):name=C.p.t +//TEST_INPUT: Sampler:name=C.p.s +//TEST_INPUT: ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer struct P { diff --git a/tests/compute/compile-time-loop.slang b/tests/compute/compile-time-loop.slang index a6dd1fd80..e081dfbd3 100644 --- a/tests/compute/compile-time-loop.slang +++ b/tests/compute/compile-time-loop.slang @@ -1,9 +1,8 @@ //TEST(compute):COMPARE_RENDER_COMPUTE: -//TEST_INPUT: Texture2D(size=4, content = one) : dxbinding(0),glbinding(0) -//TEST_INPUT: Sampler : dxbinding(0),glbinding(0) - -//TEST_INPUT: ubuffer(data=[0], stride=4):dxbinding(1),glbinding(0),out +//TEST_INPUT: Texture2D(size=4, content = one): +//TEST_INPUT: Sampler: +//TEST_INPUT: ubuffer(data=[0], stride=4):out Texture2D t; SamplerState s; diff --git a/tests/compute/constexpr.slang b/tests/compute/constexpr.slang index c3f9b6a89..247d3964d 100644 --- a/tests/compute/constexpr.slang +++ b/tests/compute/constexpr.slang @@ -1,9 +1,9 @@ // constexpr.slang //TEST(compute):COMPARE_COMPUTE_EX:-slang -gcompute //DISABLED://TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -gcompute -//TEST_INPUT: Texture2D(size=4, content = one) : dxbinding(0),glbinding(0) -//TEST_INPUT: Sampler : dxbinding(0),glbinding(0) -//TEST_INPUT: ubuffer(data=[0 0], stride=4):dxbinding(1),glbinding(0),out +//TEST_INPUT: Texture2D(size=4, content = one): +//TEST_INPUT: Sampler: +//TEST_INPUT: ubuffer(data=[0 0], stride=4):out // Note: Vulkan version of this test is disabled pending adding // support for rendering tests to the harness. diff --git a/tests/compute/continue-stmt.slang b/tests/compute/continue-stmt.slang index f21592ecc..1501173f6 100644 --- a/tests/compute/continue-stmt.slang +++ b/tests/compute/continue-stmt.slang @@ -20,7 +20,7 @@ int test(int inVal) return -ii; } -//TEST_INPUT:ubuffer(data=[0 1 2 3], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0 1 2 3], stride=4):out,name=outputBuffer RWStructuredBuffer<int> outputBuffer : register(u0); [numthreads(4, 1, 1)] diff --git a/tests/compute/default-parameter.slang b/tests/compute/default-parameter.slang index cc960f2e5..31cfa8f6a 100644 --- a/tests/compute/default-parameter.slang +++ b/tests/compute/default-parameter.slang @@ -2,7 +2,7 @@ //TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute //TEST(compute, vulkan):COMPARE_COMPUTE_EX:-cpu -compute -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<int> outputBuffer; int helper(int val, int a = 16) diff --git a/tests/compute/discard-stmt.slang b/tests/compute/discard-stmt.slang index 18ffc39e2..5a8210118 100644 --- a/tests/compute/discard-stmt.slang +++ b/tests/compute/discard-stmt.slang @@ -1,7 +1,7 @@ //TEST(compute):COMPARE_RENDER_COMPUTE: -//TEST_INPUT: Texture2D(size=4, content = one) : dxbinding(0),glbinding(0) -//TEST_INPUT: Sampler : dxbinding(0),glbinding(0) -//TEST_INPUT: ubuffer(data=[0 0], stride=4):dxbinding(1),glbinding(0),out +//TEST_INPUT: Texture2D(size=4, content = one): +//TEST_INPUT: Sampler: +//TEST_INPUT: ubuffer(data=[0 0], stride=4):out Texture2D tex; diff --git a/tests/compute/dump-repro.slang b/tests/compute/dump-repro.slang index eebe04852..314388aa6 100644 --- a/tests/compute/dump-repro.slang +++ b/tests/compute/dump-repro.slang @@ -1,6 +1,6 @@ //TEST(compute):SIMPLE:-target hlsl -dump-repro repro.slang-repro -//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name outputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0], stride=4):out,name outputBuffer RWStructuredBuffer<int> outputBuffer; //TEST_INPUT:array(size=2):name g_aoa diff --git a/tests/compute/empty-struct.slang b/tests/compute/empty-struct.slang index 5e000b723..53c19384f 100644 --- a/tests/compute/empty-struct.slang +++ b/tests/compute/empty-struct.slang @@ -4,7 +4,7 @@ // Confirm that generics syntax can be used in user // code and generates valid output. -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<float> outputBuffer; struct Simple diff --git a/tests/compute/empty-struct2.slang b/tests/compute/empty-struct2.slang index 2ec7bbc3f..0f65a39b3 100644 --- a/tests/compute/empty-struct2.slang +++ b/tests/compute/empty-struct2.slang @@ -3,7 +3,7 @@ // This is a basic test for Slang compute shader. -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<uint> outputBuffer; interface IInterface diff --git a/tests/compute/entry-point-uniform-params.slang b/tests/compute/entry-point-uniform-params.slang index e0c14ec93..af5a87616 100644 --- a/tests/compute/entry-point-uniform-params.slang +++ b/tests/compute/entry-point-uniform-params.slang @@ -27,17 +27,17 @@ struct Things // A shader parameter at global scope should be assigned // a register/binding before any related to the entry point. -//TEST_INPUT:cbuffer(data=[1 0 0 0]):dxbinding(0),glbinding(0),name=signs +//TEST_INPUT:cbuffer(data=[1 0 0 0]):name=signs ConstantBuffer<Signs> signs; [numthreads(4, 1, 1)] void computeMain( -//TEST_INPUT:cbuffer(data=[2 0 0 0 3 0 0 0]):dxbinding(1),glbinding(1),name=stuff +//TEST_INPUT:cbuffer(data=[2 0 0 0 3 0 0 0]):name=stuff uniform Stuff stuff, -//TEST_INPUT:cbuffer(data=[3]):,isCPUOnly,name=things +//TEST_INPUT:cbuffer(data=[3]):isCPUOnly,name=things uniform Things things, -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(2),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer uniform RWStructuredBuffer<int> outputBuffer, uint3 dispatchThreadID : SV_DispatchThreadID) diff --git a/tests/compute/enum-tag-conversion.slang b/tests/compute/enum-tag-conversion.slang index 869b1c3af..a5dcf2a69 100644 --- a/tests/compute/enum-tag-conversion.slang +++ b/tests/compute/enum-tag-conversion.slang @@ -17,7 +17,7 @@ int test(int val) return val + int(RoseColors.Red); } -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<int> outputBuffer; [numthreads(4, 1, 1)] diff --git a/tests/compute/enum.slang b/tests/compute/enum.slang index cbe940f30..f38adbc94 100644 --- a/tests/compute/enum.slang +++ b/tests/compute/enum.slang @@ -52,7 +52,7 @@ int test(int val) return (val << 4) + int(c); } -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<int> outputBuffer; [numthreads(4, 1, 1)] diff --git a/tests/compute/explicit-this-expr.slang b/tests/compute/explicit-this-expr.slang index 02f744662..c55bb70ff 100644 --- a/tests/compute/explicit-this-expr.slang +++ b/tests/compute/explicit-this-expr.slang @@ -15,7 +15,7 @@ struct A } }; -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<float> outputBuffer : register(u0); diff --git a/tests/compute/extension-multi-interface.slang b/tests/compute/extension-multi-interface.slang index f13769f56..cde6c4a5a 100644 --- a/tests/compute/extension-multi-interface.slang +++ b/tests/compute/extension-multi-interface.slang @@ -1,7 +1,7 @@ //TEST(compute):COMPARE_COMPUTE: //TEST(compute):COMPARE_COMPUTE:-cpu -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<float> outputBuffer; interface IAdd diff --git a/tests/compute/extension-on-interface.slang b/tests/compute/extension-on-interface.slang index 4f516092d..cbf65f83f 100644 --- a/tests/compute/extension-on-interface.slang +++ b/tests/compute/extension-on-interface.slang @@ -1,7 +1,7 @@ //TEST(compute):COMPARE_COMPUTE: //TEST(compute):COMPARE_COMPUTE:-cpu -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<float> outputBuffer; interface IOp diff --git a/tests/compute/frem.slang b/tests/compute/frem.slang index 60012ea1e..848f0513a 100644 --- a/tests/compute/frem.slang +++ b/tests/compute/frem.slang @@ -7,7 +7,7 @@ // Test uses of floating-point `%` operator. RWStructuredBuffer<float> gInput; -//TEST_INPUT:ubuffer(data=[2.0 1.0 5.0 2.0 2.0 -4.0 -5.0 2.0], stride=4):dxbinding(0),glbinding(0),name=gInput +//TEST_INPUT:ubuffer(data=[2.0 1.0 5.0 2.0 2.0 -4.0 -5.0 2.0], stride=4):name=gInput int test(int inVal) { @@ -16,7 +16,7 @@ int test(int inVal) return int(a % b); } -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(1),glbinding(1),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<int> outputBuffer; [numthreads(4, 1, 1)] diff --git a/tests/compute/func-cbuffer-param.slang b/tests/compute/func-cbuffer-param.slang index a0784e21e..a67c9ca00 100644 --- a/tests/compute/func-cbuffer-param.slang +++ b/tests/compute/func-cbuffer-param.slang @@ -15,13 +15,13 @@ struct Data int4 val[4]; } -//TEST_INPUT:cbuffer(data=[0 1 2 3 16 17 18 19 32 33 34 35 48 49 50 51]):dxbinding(0),glbinding(0),name=a +//TEST_INPUT:cbuffer(data=[0 1 2 3 16 17 18 19 32 33 34 35 48 49 50 51]):name=a ConstantBuffer<Data> a; -//TEST_INPUT:cbuffer(data=[16 17 18 19 32 33 34 35 48 49 50 51 64 65 66 67]):dxbinding(1),glbinding(1),name=b +//TEST_INPUT:cbuffer(data=[16 17 18 19 32 33 34 35 48 49 50 51 64 65 66 67]):name=b ConstantBuffer<Data> b; -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(2),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<int> outputBuffer; int helper(ConstantBuffer<Data> buffer, int index) diff --git a/tests/compute/func-param-legalize.slang b/tests/compute/func-param-legalize.slang index a68766389..877324ac7 100644 --- a/tests/compute/func-param-legalize.slang +++ b/tests/compute/func-param-legalize.slang @@ -7,11 +7,11 @@ struct Param float base; }; -//TEST_INPUT:Texture2D(size=4, content = one) : dxbinding(0),glbinding(0),name=diffuseMap +//TEST_INPUT:Texture2D(size=4, content = one):name=diffuseMap Texture2D diffuseMap; -//TEST_INPUT: Sampler : dxbinding(0),glbinding(0,1,2,3,4,5,6),name=samplerState +//TEST_INPUT: Sampler:name=samplerState SamplerState samplerState; -//TEST_INPUT: ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT: ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<float> outputBuffer; float4 run(Param p) diff --git a/tests/compute/func-resource-param.slang b/tests/compute/func-resource-param.slang index 2f6668dce..570501c50 100644 --- a/tests/compute/func-resource-param.slang +++ b/tests/compute/func-resource-param.slang @@ -11,10 +11,10 @@ //NO_TEST:SIMPLE:-target glsl -entry computeMain -stage compute -validate-ir -dump-ir -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<int> outputBuffer; -//TEST_INPUT:ubuffer(data=[0 16 32 48], stride=4):dxbinding(1),glbinding(1),name=inputBuffer +//TEST_INPUT:ubuffer(data=[0 16 32 48], stride=4):name=inputBuffer RWStructuredBuffer<int> inputBuffer; int helper(RWStructuredBuffer<int> buffer, int index) diff --git a/tests/compute/generic-closer.slang b/tests/compute/generic-closer.slang index a40d520cc..428174d1c 100644 --- a/tests/compute/generic-closer.slang +++ b/tests/compute/generic-closer.slang @@ -17,7 +17,7 @@ struct Gen1<TGetter : IGetter> : IGetter int get() { return g.get(); } }; -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<int> outputBuffer; void writeArray(inout float3 a[4]) diff --git a/tests/compute/generic-interface-method-simple.slang b/tests/compute/generic-interface-method-simple.slang index a8b2fcd8a..8a3207671 100644 --- a/tests/compute/generic-interface-method-simple.slang +++ b/tests/compute/generic-interface-method-simple.slang @@ -1,7 +1,7 @@ //TEST(compute):COMPARE_COMPUTE: //TEST(compute):COMPARE_COMPUTE:-cpu -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<float> outputBuffer; interface IVertexInterpolant diff --git a/tests/compute/generic-interface-method.slang b/tests/compute/generic-interface-method.slang index 16d891636..47fa94f89 100644 --- a/tests/compute/generic-interface-method.slang +++ b/tests/compute/generic-interface-method.slang @@ -1,7 +1,7 @@ //TEST(compute):COMPARE_COMPUTE: //TEST(compute):COMPARE_COMPUTE:-cpu -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<float> outputBuffer; struct DisneyBRDFPattern diff --git a/tests/compute/generic-list.slang b/tests/compute/generic-list.slang index 8b88a35ac..cf2433ebc 100644 --- a/tests/compute/generic-list.slang +++ b/tests/compute/generic-list.slang @@ -4,7 +4,7 @@ // Confirm that generics syntax can be used in user // code and generates valid output. -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<float4> outputBuffer; interface IElement diff --git a/tests/compute/generic-struct-with-constraint.slang b/tests/compute/generic-struct-with-constraint.slang index 5468cce80..1263a7548 100644 --- a/tests/compute/generic-struct-with-constraint.slang +++ b/tests/compute/generic-struct-with-constraint.slang @@ -4,7 +4,7 @@ // Confirm that generics syntax can be used in user // code and generates valid output. -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<float4> outputBuffer; interface IElement diff --git a/tests/compute/generic-struct.slang b/tests/compute/generic-struct.slang index 8c97ef76d..7e0496c5f 100644 --- a/tests/compute/generic-struct.slang +++ b/tests/compute/generic-struct.slang @@ -4,7 +4,7 @@ // Check that user code can declare and use a generic // `struct` type. -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<int> outputBuffer; __generic<T> diff --git a/tests/compute/generics-constrained.slang b/tests/compute/generics-constrained.slang index eb3df321a..72d6b4777 100644 --- a/tests/compute/generics-constrained.slang +++ b/tests/compute/generics-constrained.slang @@ -27,7 +27,7 @@ float testHelp(T helper) return helper.getHelp(); } -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<float> outputBuffer : register(u0); diff --git a/tests/compute/generics-constructor.slang b/tests/compute/generics-constructor.slang index d36f72a59..0439856cb 100644 --- a/tests/compute/generics-constructor.slang +++ b/tests/compute/generics-constructor.slang @@ -1,7 +1,7 @@ //TEST(compute):COMPARE_COMPUTE: //TEST(compute):COMPARE_COMPUTE:-cpu -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<float> outputBuffer; __generic<T:__BuiltinFloatingPointType> diff --git a/tests/compute/generics-overload.slang b/tests/compute/generics-overload.slang index 8d30666c3..05bb075e7 100644 --- a/tests/compute/generics-overload.slang +++ b/tests/compute/generics-overload.slang @@ -4,7 +4,7 @@ // Confirm that generics syntax can be used in user // code and generates valid output. -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<float> outputBuffer; diff --git a/tests/compute/generics-simple.slang b/tests/compute/generics-simple.slang index f7b73a5e6..dd1ffa932 100644 --- a/tests/compute/generics-simple.slang +++ b/tests/compute/generics-simple.slang @@ -4,7 +4,7 @@ // Confirm that generics syntax can be used in user // code and generates valid output. -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<float> outputBuffer; diff --git a/tests/compute/generics-syntax-2.slang b/tests/compute/generics-syntax-2.slang index f57ccb9ed..3f83528a5 100644 --- a/tests/compute/generics-syntax-2.slang +++ b/tests/compute/generics-syntax-2.slang @@ -4,7 +4,7 @@ // Confirm that generics syntax can be used in user // code and generates valid output. -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<float> outputBuffer; struct GenStruct<T> diff --git a/tests/compute/generics-syntax.slang b/tests/compute/generics-syntax.slang index 2d1adea44..d0f3d6eb4 100644 --- a/tests/compute/generics-syntax.slang +++ b/tests/compute/generics-syntax.slang @@ -4,7 +4,7 @@ // Confirm that generics syntax can be used in user // code and generates valid output. -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<float> outputBuffer; struct GenStruct<T> diff --git a/tests/compute/global-generic-value-param.slang b/tests/compute/global-generic-value-param.slang index c20e32784..6214925c6 100644 --- a/tests/compute/global-generic-value-param.slang +++ b/tests/compute/global-generic-value-param.slang @@ -29,7 +29,7 @@ __generic_value_param kOffset : uint = 0; // bit less trivial. // RWStructuredBuffer<uint> vals; -//TEST_INPUT: ubuffer(data=[0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15], stride=4):dxbinding(0),glbinding(0) +//TEST_INPUT: ubuffer(data=[0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15], stride=4): // The core test function will use the `kOffset` value // we declared above along with the input value (the @@ -45,7 +45,7 @@ uint test(uint value) // And finally we have the boilerplate cruft that almost // all of our compute tests use. -//TEST_INPUT: ubuffer(data=[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0], stride=4):dxbinding(0),glbinding(1),out +//TEST_INPUT: ubuffer(data=[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0], stride=4):out RWStructuredBuffer<uint> outputBuffer; [numthreads(16, 1, 1)] diff --git a/tests/compute/global-init.slang b/tests/compute/global-init.slang index db99d1f2f..42e8ff30b 100644 --- a/tests/compute/global-init.slang +++ b/tests/compute/global-init.slang @@ -11,7 +11,7 @@ int test(int inVal) return inVal + gVar; } -//TEST_INPUT:ubuffer(data=[0 1 2 3], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0 1 2 3], stride=4):out,name=outputBuffer RWStructuredBuffer<int> outputBuffer : register(u0); [numthreads(4, 1, 1)] diff --git a/tests/compute/global-type-param-array.slang b/tests/compute/global-type-param-array.slang index d801efe2c..ac514901f 100644 --- a/tests/compute/global-type-param-array.slang +++ b/tests/compute/global-type-param-array.slang @@ -1,6 +1,6 @@ //TEST(compute):COMPARE_COMPUTE: -//TEST_INPUT: cbuffer(data=[1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0], stride=4):dxbinding(0),glbinding(0) -//TEST_INPUT: ubuffer(data=[0], stride=4):dxbinding(0),glbinding(0),out +//TEST_INPUT: cbuffer(data=[1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0], stride=4): +//TEST_INPUT: ubuffer(data=[0], stride=4):out //TEST_INPUT: type Pair<Arr<Base,1>, Pair<Arr<Base,2> , Base> > RWStructuredBuffer<float> outputBuffer; diff --git a/tests/compute/global-type-param-in-entrypoint.slang b/tests/compute/global-type-param-in-entrypoint.slang index 0386a7d10..06320ba0f 100644 --- a/tests/compute/global-type-param-in-entrypoint.slang +++ b/tests/compute/global-type-param-in-entrypoint.slang @@ -1,6 +1,6 @@ //TEST(compute):COMPARE_RENDER_COMPUTE: -//TEST_INPUT: cbuffer(data=[1.0 0.0 0.0 0.0 0.0 1.0 0.0 0.0 0.0 0.0 1.0 0.0 0.0 0.0 0.0 1.0], stride=16):dxbinding(0),glbinding(0) -//TEST_INPUT: ubuffer(data=[0 0 0 0], stride=4):dxbinding(1),glbinding(0),out +//TEST_INPUT: cbuffer(data=[1.0 0.0 0.0 0.0 0.0 1.0 0.0 0.0 0.0 0.0 1.0 0.0 0.0 0.0 0.0 1.0], stride=16): +//TEST_INPUT: ubuffer(data=[0 0 0 0], stride=4):out //TEST_INPUT: global_type VertImpl interface IVertInterpolant diff --git a/tests/compute/global-type-param.slang b/tests/compute/global-type-param.slang index ed0591064..ecaa26096 100644 --- a/tests/compute/global-type-param.slang +++ b/tests/compute/global-type-param.slang @@ -2,7 +2,7 @@ //TEST_INPUT:type Wrapper<Impl> -//TEST_INPUT:ubuffer(data=[0], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0], stride=4):out,name=outputBuffer RWStructuredBuffer<float> outputBuffer; interface IBase diff --git a/tests/compute/global-type-param1.slang b/tests/compute/global-type-param1.slang index f33be8ec7..5362af5e0 100644 --- a/tests/compute/global-type-param1.slang +++ b/tests/compute/global-type-param1.slang @@ -1,11 +1,11 @@ //TEST(smoke,compute):COMPARE_COMPUTE: -//TEST_INPUT: cbuffer(data=[0.5 0 0 0 1.0], stride=4):dxbinding(0),glbinding(0) -//TEST_INPUT: cbuffer(data=[1.0], stride=4):dxbinding(1),glbinding(1) -//TEST_INPUT: Texture2D(size=4, content = zero) : dxbinding(0),glbinding(0) -//TEST_INPUT: Texture2D(size=4, content = one) : dxbinding(1),glbinding(1) -//TEST_INPUT: Sampler : dxbinding(0),glbinding(0,1,2,3,4,5,6) -//TEST_INPUT: Sampler : dxbinding(1),glbinding(0,1,2,3,4,5,6) -//TEST_INPUT: ubuffer(data=[0], stride=4):dxbinding(0),glbinding(0),out +//TEST_INPUT: cbuffer(data=[0.5 0 0 0 1.0], stride=4): +//TEST_INPUT: cbuffer(data=[1.0], stride=4): +//TEST_INPUT: Texture2D(size=4, content = zero): +//TEST_INPUT: Texture2D(size=4, content = one): +//TEST_INPUT: Sampler: +//TEST_INPUT: Sampler: +//TEST_INPUT: ubuffer(data=[0], stride=4):out //TEST_INPUT: type Impl RWStructuredBuffer<float> outputBuffer; diff --git a/tests/compute/global-type-param2.slang b/tests/compute/global-type-param2.slang index 976a31df8..d731e356a 100644 --- a/tests/compute/global-type-param2.slang +++ b/tests/compute/global-type-param2.slang @@ -1,11 +1,11 @@ //TEST(smoke,compute):COMPARE_COMPUTE: -//TEST_INPUT: cbuffer(data=[0.5 0 0 0], stride=4):dxbinding(0),glbinding(0) -//TEST_INPUT: cbuffer(data=[1.0], stride=4):dxbinding(1),glbinding(1) -//TEST_INPUT: Texture2D(size=4, content = zero) : dxbinding(0),glbinding(0) -//TEST_INPUT: Texture2D(size=4, content = one) : dxbinding(1),glbinding(1) -//TEST_INPUT: Sampler : dxbinding(0),glbinding(0,1,2,3,4,5,6) -//TEST_INPUT: Sampler : dxbinding(1),glbinding(0,1,2,3,4,5,6) -//TEST_INPUT: ubuffer(data=[0], stride=4):dxbinding(0),glbinding(0),out +//TEST_INPUT: cbuffer(data=[0.5 0 0 0], stride=4): +//TEST_INPUT: cbuffer(data=[1.0], stride=4): +//TEST_INPUT: Texture2D(size=4, content = zero): +//TEST_INPUT: Texture2D(size=4, content = one): +//TEST_INPUT: Sampler: +//TEST_INPUT: Sampler: +//TEST_INPUT: ubuffer(data=[0], stride=4):out //TEST_INPUT: type Impl diff --git a/tests/compute/groupshared.slang b/tests/compute/groupshared.slang index e471e6148..8712ee878 100644 --- a/tests/compute/groupshared.slang +++ b/tests/compute/groupshared.slang @@ -4,7 +4,7 @@ //TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 //TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out #define THREAD_COUNT 4 diff --git a/tests/compute/half-calc.slang b/tests/compute/half-calc.slang index a100ba237..7c94a0d4f 100644 --- a/tests/compute/half-calc.slang +++ b/tests/compute/half-calc.slang @@ -1,6 +1,6 @@ //DISABLE_TEST(compute):COMPARE_COMPUTE:-dx12 -compute -use-dxil -profile cs_6_2 -render-features half //TEST(compute):COMPARE_COMPUTE:-vk -compute -profile cs_6_2 -render-features half -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out // Test for doing a calculation using half diff --git a/tests/compute/half-structured-buffer.slang b/tests/compute/half-structured-buffer.slang index 778c106c1..08323913e 100644 --- a/tests/compute/half-structured-buffer.slang +++ b/tests/compute/half-structured-buffer.slang @@ -2,7 +2,7 @@ //Disable on Dx12 for now - because writing to structured buffer produces unexpected results //TEST_DISABLED(compute):COMPARE_COMPUTE:-dx12 -compute -use-dxil -profile cs_6_2 -render-features half -//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0], stride=16):dxbinding(0),glbinding(0),out +//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0], stride=16):out struct Thing { diff --git a/tests/compute/half-texture.slang b/tests/compute/half-texture.slang index 3f2c5500e..b4dafac99 100644 --- a/tests/compute/half-texture.slang +++ b/tests/compute/half-texture.slang @@ -1,17 +1,17 @@ //TEST:CROSS_COMPILE: -target spirv -entry computeMain -profile cs_6_2 //TEST:SIMPLE: -target hlsl -entry computeMain -profile cs_6_2 -//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0], stride=16):dxbinding(0),glbinding(0),out +//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0], stride=16):out RWStructuredBuffer<int> outputBuffer; -//TEST_INPUT: Texture2D(size=4):dxbinding(1),glbinding(1) +//TEST_INPUT: Texture2D(size=4): RWTexture2D<half> halfTexture; -//TEST_INPUT: Texture2D(size=4):dxbinding(2),glbinding(2) +//TEST_INPUT: Texture2D(size=4): RWTexture2D<half2> halfTexture2; -//TEST_INPUT: Texture2D(size=4):dxbinding(3),glbinding(3) +//TEST_INPUT: Texture2D(size=4): RWTexture2D<half4> halfTexture4; -//TEST_INPUT: Sampler : dxbinding(0),glbinding(0) +//TEST_INPUT: Sampler: SamplerState s; [numthreads(4, 4, 1)] diff --git a/tests/compute/implicit-generic-app.slang b/tests/compute/implicit-generic-app.slang index 53edefc66..6c2658372 100644 --- a/tests/compute/implicit-generic-app.slang +++ b/tests/compute/implicit-generic-app.slang @@ -29,7 +29,7 @@ int test(int val) return doIt(simple); } -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<int> outputBuffer : register(u0); [numthreads(4, 1, 1)] diff --git a/tests/compute/implicit-this-expr.slang b/tests/compute/implicit-this-expr.slang index 2197cde10..9a77b6a4f 100644 --- a/tests/compute/implicit-this-expr.slang +++ b/tests/compute/implicit-this-expr.slang @@ -14,7 +14,7 @@ struct A } }; -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<float> outputBuffer : register(u0); float test(float inVal) diff --git a/tests/compute/init-list-defaults.slang b/tests/compute/init-list-defaults.slang index 9ed54ffaa..fa7ef5c8e 100644 --- a/tests/compute/init-list-defaults.slang +++ b/tests/compute/init-list-defaults.slang @@ -23,7 +23,7 @@ int test(int inVal) + (inVal+1)*4096; } -//TEST_INPUT:ubuffer(data=[9 9 9 9], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[9 9 9 9], stride=4):out,name=outputBuffer RWStructuredBuffer<int> outputBuffer : register(u0); [numthreads(4, 1, 1)] diff --git a/tests/compute/initializer-list.slang b/tests/compute/initializer-list.slang index 7d0af700e..6dde8694e 100644 --- a/tests/compute/initializer-list.slang +++ b/tests/compute/initializer-list.slang @@ -15,7 +15,7 @@ uint test(uint val) return val + t.b; } -//TEST_INPUT: ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT: ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<uint> outputBuffer; [numthreads(4, 1, 1)] diff --git a/tests/compute/inout.slang b/tests/compute/inout.slang index b7c64d57f..e1af8b256 100644 --- a/tests/compute/inout.slang +++ b/tests/compute/inout.slang @@ -35,7 +35,7 @@ int test(int inVal) return x3; } -//TEST_INPUT:ubuffer(data=[0 1 2 3], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0 1 2 3], stride=4):out,name=outputBuffer RWStructuredBuffer<int> outputBuffer : register(u0); [numthreads(4, 1, 1)] diff --git a/tests/compute/int-generic.slang b/tests/compute/int-generic.slang index c62ecf3d7..2d3c57575 100644 --- a/tests/compute/int-generic.slang +++ b/tests/compute/int-generic.slang @@ -2,7 +2,7 @@ //TEST_INPUT:type Material<1,2> -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<int> outputBuffer; interface IBRDF diff --git a/tests/compute/interface-local.slang b/tests/compute/interface-local.slang index 0a3d1c85f..6e42d30ab 100644 --- a/tests/compute/interface-local.slang +++ b/tests/compute/interface-local.slang @@ -37,7 +37,7 @@ int test(int val) return existentialHelper.getVal(); } -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=gOutputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=gOutputBuffer RWStructuredBuffer<int> gOutputBuffer; [numthreads(4, 1, 1)] diff --git a/tests/compute/interface-param.slang b/tests/compute/interface-param.slang index 6e0a735f4..18edbe3be 100644 --- a/tests/compute/interface-param.slang +++ b/tests/compute/interface-param.slang @@ -32,7 +32,7 @@ int test(int val) return doTheThing(helperImpl); } -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=gOutputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=gOutputBuffer RWStructuredBuffer<int> gOutputBuffer; [numthreads(4, 1, 1)] diff --git a/tests/compute/interface-shader-param-in-struct.slang b/tests/compute/interface-shader-param-in-struct.slang index b033bd31c..a4dad6ccb 100644 --- a/tests/compute/interface-shader-param-in-struct.slang +++ b/tests/compute/interface-shader-param-in-struct.slang @@ -41,7 +41,7 @@ int test( } -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out RWStructuredBuffer<int> gOutputBuffer; cbuffer C @@ -50,7 +50,7 @@ cbuffer C } //TEST_INPUT: globalExistentialType MyStrategy -//TEST_INPUT:ubuffer(data=[1 2 4 8], stride=4):dxbinding(1),glbinding(1) +//TEST_INPUT:ubuffer(data=[1 2 4 8], stride=4): struct Stuff { @@ -60,7 +60,7 @@ struct Stuff [numthreads(4, 1, 1)] void computeMain( -//TEST_INPUT:cbuffer(data=[256]):dxbinding(0),glbinding(2) +//TEST_INPUT:cbuffer(data=[256]): uniform Stuff stuff, uint3 dispatchThreadID : SV_DispatchThreadID) @@ -111,4 +111,4 @@ struct MyModifier : IModifier } //TEST_INPUT: entryPointExistentialType MyModifier -//TEST_INPUT:ubuffer(data=[16 32 64 128], stride=4):dxbinding(2),glbinding(3) +//TEST_INPUT:ubuffer(data=[16 32 64 128], stride=4): diff --git a/tests/compute/interface-shader-param-legalization.slang b/tests/compute/interface-shader-param-legalization.slang index 8c63d81ac..26603bfaa 100644 --- a/tests/compute/interface-shader-param-legalization.slang +++ b/tests/compute/interface-shader-param-legalization.slang @@ -19,7 +19,7 @@ int test( } -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out RWStructuredBuffer<int> gOutputBuffer; [numthreads(4, 1, 1)] @@ -51,4 +51,4 @@ struct ConcreteModifier : IModifier } //TEST_INPUT: globalExistentialType ConcreteModifier -//TEST_INPUT:cbuffer(data=[256], stride=4):dxbinding(0),glbinding(0),out +//TEST_INPUT:cbuffer(data=[256], stride=4):out diff --git a/tests/compute/interface-shader-param.slang b/tests/compute/interface-shader-param.slang index 75788ee9a..8979b66e0 100644 --- a/tests/compute/interface-shader-param.slang +++ b/tests/compute/interface-shader-param.slang @@ -75,7 +75,7 @@ int test( // // We'll start with the buffer for writing the test output. -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=gOutputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=gOutputBuffer RWStructuredBuffer<int> gOutputBuffer; // Now we'll define a global shader parameter for the diff --git a/tests/compute/interface-shader-param2.slang b/tests/compute/interface-shader-param2.slang index 039765084..0d15d9657 100644 --- a/tests/compute/interface-shader-param2.slang +++ b/tests/compute/interface-shader-param2.slang @@ -42,16 +42,16 @@ int test( } -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out RWStructuredBuffer<int> gOutputBuffer; -//TEST_INPUT:cbuffer(data=[1 0 0 0], stride=4):dxbinding(0),glbinding(1) +//TEST_INPUT:cbuffer(data=[1 0 0 0], stride=4): ConstantBuffer<IRandomNumberGenerationStrategy> gStrategy; [numthreads(4, 1, 1)] void computeMain( -//TEST_INPUT:cbuffer(data=[8 0 0 0], stride=4):dxbinding(1),glbinding(2) +//TEST_INPUT:cbuffer(data=[8 0 0 0], stride=4): uniform IModifier modifier, uint3 dispatchThreadID : SV_DispatchThreadID) { diff --git a/tests/compute/interface-shader-param3.slang b/tests/compute/interface-shader-param3.slang index f4f45689c..7e42595a1 100644 --- a/tests/compute/interface-shader-param3.slang +++ b/tests/compute/interface-shader-param3.slang @@ -42,7 +42,7 @@ int test( } -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out RWStructuredBuffer<int> gOutputBuffer; ConstantBuffer<IRandomNumberGenerationStrategy> gStrategy; @@ -56,7 +56,7 @@ ConstantBuffer<IRandomNumberGenerationStrategy> gStrategy; // type argument at the same time. // //TEST_INPUT: globalExistentialType MyStrategy -//TEST_INPUT:cbuffer(data=[1 0 0 0], stride=4):dxbinding(0),glbinding(1) +//TEST_INPUT:cbuffer(data=[1 0 0 0], stride=4): [numthreads(4, 1, 1)] void computeMain( @@ -83,7 +83,7 @@ void computeMain( // // Here's the incantation to make the test runner fill in the constant buffer: // -//TEST_INPUT:cbuffer(data=[256 0 0 0 16 0 0 0], stride=4):dxbinding(1),glbinding(2) +//TEST_INPUT:cbuffer(data=[256 0 0 0 16 0 0 0], stride=4): // // So, the value `256` will be used for `extra` and the value `16` // will be written to the first four bytes of the concrete value diff --git a/tests/compute/interface-shader-param4.slang b/tests/compute/interface-shader-param4.slang index 51b6686ef..317128613 100644 --- a/tests/compute/interface-shader-param4.slang +++ b/tests/compute/interface-shader-param4.slang @@ -43,7 +43,7 @@ int test( } -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out RWStructuredBuffer<int> gOutputBuffer; ConstantBuffer<IRandomNumberGenerationStrategy> gStrategy; @@ -57,7 +57,7 @@ ConstantBuffer<IRandomNumberGenerationStrategy> gStrategy; // Here's the data for `gStrategy`: // //TEST_INPUT: globalExistentialType MyStrategy -//TEST_INPUT:ubuffer(data=[1 2 4 8], stride=4):dxbinding(1),glbinding(1) +//TEST_INPUT:ubuffer(data=[1 2 4 8], stride=4): [numthreads(4, 1, 1)] @@ -75,7 +75,7 @@ void computeMain( // the previous test, the concrete type plugged in for `modifier` // has no uniform/ordinary data, so we don't need to fill it in. // -//TEST_INPUT:cbuffer(data=[256]):dxbinding(0),glbinding(2) +//TEST_INPUT:cbuffer(data=[256]): uint3 dispatchThreadID : SV_DispatchThreadID) { @@ -127,4 +127,4 @@ struct MyModifier : IModifier // Here's the data for `modifier`: // //TEST_INPUT: entryPointExistentialType MyModifier -//TEST_INPUT:ubuffer(data=[16 32 64 128], stride=4):dxbinding(2),glbinding(3) +//TEST_INPUT:ubuffer(data=[16 32 64 128], stride=4): diff --git a/tests/compute/interface-static-method.slang b/tests/compute/interface-static-method.slang index f10e00783..bdfddd938 100644 --- a/tests/compute/interface-static-method.slang +++ b/tests/compute/interface-static-method.slang @@ -46,7 +46,7 @@ int test(int val) } -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<int> outputBuffer; [numthreads(4, 1, 1)] diff --git a/tests/compute/loop-unroll.slang b/tests/compute/loop-unroll.slang index b8ac97b44..b8ec06768 100644 --- a/tests/compute/loop-unroll.slang +++ b/tests/compute/loop-unroll.slang @@ -1,7 +1,7 @@ //TEST(compute):COMPARE_COMPUTE: -//TEST_INPUT:ubuffer(data=[0 1 2 3], stride=4):dxbinding(0),glbinding(0),out -//TEST_INPUT:ubuffer(data=[1 2 3 0], stride=4):dxbinding(1),glbinding(1) +//TEST_INPUT:ubuffer(data=[0 1 2 3], stride=4):out +//TEST_INPUT:ubuffer(data=[1 2 3 0], stride=4): // Check that we propagate the `[unroll]` attribute // through to HLSL output correctly. diff --git a/tests/compute/matrix-layout-structured-buffer.slang b/tests/compute/matrix-layout-structured-buffer.slang index 68b591f1b..36596424d 100644 --- a/tests/compute/matrix-layout-structured-buffer.slang +++ b/tests/compute/matrix-layout-structured-buffer.slang @@ -17,7 +17,7 @@ //TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -xslang -matrix-layout-row-major //TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -xslang -matrix-layout-column-major -//TEST_INPUT:ubuffer(data=[0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23], stride=48):dxbinding(0),glbinding(0),name=gMatrices +//TEST_INPUT:ubuffer(data=[0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23], stride=48):name=gMatrices RWStructuredBuffer<int3x4> gMatrices; int test(int val) @@ -35,7 +35,7 @@ int test(int val) return tmp; } -//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0 0 0 0 0], stride=4):dxbinding(0),glbinding(1),out +//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0 0 0 0 0], stride=4):out RWStructuredBuffer<int> buffer; [numthreads(12, 1, 1)] diff --git a/tests/compute/matrix-layout.hlsl b/tests/compute/matrix-layout.hlsl index 64d863eb3..0993a1bb2 100644 --- a/tests/compute/matrix-layout.hlsl +++ b/tests/compute/matrix-layout.hlsl @@ -23,13 +23,13 @@ struct S int b; }; -//TEST_INPUT:cbuffer(data=[1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24]):dxbinding(0),glbinding(0) +//TEST_INPUT:cbuffer(data=[1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24]): cbuffer C0 { S s; }; -//TEST_INPUT:cbuffer(data=[1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24]):dxbinding(1),glbinding(1) +//TEST_INPUT:cbuffer(data=[1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24]): cbuffer C1 { @@ -60,7 +60,7 @@ int test(int val) return ((a*N + b) * N + c) * N + d; } -//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0 0 0 0 0], stride=4):dxbinding(0),glbinding(2),out,name=buffer +//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0 0 0 0 0], stride=4):out,name=buffer RWStructuredBuffer<int> buffer; [numthreads(12, 1, 1)] diff --git a/tests/compute/modern-syntax.slang b/tests/compute/modern-syntax.slang index cf5f89370..4f7b94f01 100644 --- a/tests/compute/modern-syntax.slang +++ b/tests/compute/modern-syntax.slang @@ -15,7 +15,7 @@ func test(val: MyInt) -> MyInt return tmp; } -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<int> outputBuffer; [numthreads(4, 1, 1)] diff --git a/tests/compute/multi-interface.slang b/tests/compute/multi-interface.slang index f3c18ba42..bcb25b6dc 100644 --- a/tests/compute/multi-interface.slang +++ b/tests/compute/multi-interface.slang @@ -1,7 +1,7 @@ //TEST(compute):COMPARE_COMPUTE: //TEST(compute):COMPARE_COMPUTE:-cpu -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<float> outputBuffer; interface IAdd diff --git a/tests/compute/multiple-continue-sites.slang b/tests/compute/multiple-continue-sites.slang index afab66a95..d5cbf926b 100644 --- a/tests/compute/multiple-continue-sites.slang +++ b/tests/compute/multiple-continue-sites.slang @@ -27,7 +27,7 @@ int test(int inVal) return ii; } -//TEST_INPUT:ubuffer(data=[0 1 2 3], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0 1 2 3], stride=4):out,name=outputBuffer RWStructuredBuffer<int> outputBuffer : register(u0); [numthreads(4, 1, 1)] diff --git a/tests/compute/mutating-methods.slang b/tests/compute/mutating-methods.slang index bb3bdeb7e..c386da67f 100644 --- a/tests/compute/mutating-methods.slang +++ b/tests/compute/mutating-methods.slang @@ -41,7 +41,7 @@ int test(int x) return a.state; } -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<int> outputBuffer; [numthreads(4, 1, 1)] diff --git a/tests/compute/nested-generics.slang b/tests/compute/nested-generics.slang index de1e52991..e1b62a2ad 100644 --- a/tests/compute/nested-generics.slang +++ b/tests/compute/nested-generics.slang @@ -3,7 +3,7 @@ // test specialization of nested generic functions -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<int> outputBuffer; interface IGetF diff --git a/tests/compute/nested-generics2.slang b/tests/compute/nested-generics2.slang index 855f97a11..c1b12179c 100644 --- a/tests/compute/nested-generics2.slang +++ b/tests/compute/nested-generics2.slang @@ -3,7 +3,7 @@ // test specialization of nested generic functions -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<int> outputBuffer; interface IBRDF diff --git a/tests/compute/parameter-block.slang b/tests/compute/parameter-block.slang index 8c1675405..a6424134c 100644 --- a/tests/compute/parameter-block.slang +++ b/tests/compute/parameter-block.slang @@ -1,8 +1,8 @@ //TEST(compute):COMPARE_COMPUTE: //TEST(compute):COMPARE_COMPUTE:-cpu -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=block0.buffer -//TEST_INPUT:ubuffer(data=[0 1 2 3], stride=4):dxbinding(1),glbinding(1),name=block1.buffer +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=block0.buffer +//TEST_INPUT:ubuffer(data=[0 1 2 3], stride=4):name=block1.buffer // Ensure that Slang `ParameterBlock` type is lowered // to HLSL in the fashion that we expect. diff --git a/tests/compute/performance-profile.slang b/tests/compute/performance-profile.slang index 6ec8ecd94..bf67a4478 100644 --- a/tests/compute/performance-profile.slang +++ b/tests/compute/performance-profile.slang @@ -4,7 +4,7 @@ //TEST(compute):PERFORMANCE_PROFILE:-slang -compute -dx12 -compute-dispatch 256,1,1 //TEST(compute, vulkan):PERFORMANCE_PROFILE:-vk -compute -compute-dispatch 256,1,1 -//TEST_INPUT:ubuffer(random(float, 4096, -1, 1), stride=4):dxbinding(0),glbinding(0),out,name outputBuffer +//TEST_INPUT:ubuffer(random(float, 4096, -1, 1), stride=4):out,name outputBuffer #ifndef __cplusplus diff --git a/tests/compute/rewriter-parameter-block-complex.hlsl b/tests/compute/rewriter-parameter-block-complex.hlsl index 48f0ebb0b..efcf89b24 100644 --- a/tests/compute/rewriter-parameter-block-complex.hlsl +++ b/tests/compute/rewriter-parameter-block-complex.hlsl @@ -1,12 +1,12 @@ //TEST(compute):COMPARE_COMPUTE: -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out -//TEST_INPUT:cbuffer(data=[256]):dxbinding(0),glbinding(0) -//TEST_INPUT:ubuffer(data=[0 1 2 3], stride=4):dxbinding(1),glbinding(1) +//TEST_INPUT:cbuffer(data=[256]): +//TEST_INPUT:ubuffer(data=[0 1 2 3], stride=4): -//TEST_INPUT:cbuffer(data=[4096]):dxbinding(1),glbinding(1) -//TEST_INPUT:ubuffer(data=[16 32 48 64], stride=4):dxbinding(2),glbinding(2) +//TEST_INPUT:cbuffer(data=[4096]): +//TEST_INPUT:ubuffer(data=[16 32 48 64], stride=4): // Test that we can declare a `ParameterBlock<...>` type as a shader // parameter (potentially nested inside a `cbuffer`) and use it in diff --git a/tests/compute/rewriter-parameter-block.hlsl b/tests/compute/rewriter-parameter-block.hlsl index 3e0b3f73e..825d8ba6e 100644 --- a/tests/compute/rewriter-parameter-block.hlsl +++ b/tests/compute/rewriter-parameter-block.hlsl @@ -1,14 +1,14 @@ //TEST(compute):COMPARE_COMPUTE: -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out -//TEST_INPUT:cbuffer(data=[256]):dxbinding(0),glbinding(0) -//TEST_INPUT:ubuffer(data=[0 1 2 3], stride=4):dxbinding(1),glbinding(1) +//TEST_INPUT:cbuffer(data=[256]): +//TEST_INPUT:ubuffer(data=[0 1 2 3], stride=4): -//TEST_INPUT:cbuffer(data=[65536]):dxbinding(1),glbinding(1) +//TEST_INPUT:cbuffer(data=[65536]): -//TEST_INPUT:cbuffer(data=[4096]):dxbinding(2),glbinding(2) -//TEST_INPUT:ubuffer(data=[16 32 48 64], stride=4):dxbinding(2),glbinding(2) +//TEST_INPUT:cbuffer(data=[4096]): +//TEST_INPUT:ubuffer(data=[16 32 48 64], stride=4): // Test that we can declare a `ParameterBlock<...>` type as a shader // parameter (potentially nested inside a `cbuffer`) and use it in diff --git a/tests/compute/scope-operator.slang b/tests/compute/scope-operator.slang index 2afb642ab..eb65d7d2a 100644 --- a/tests/compute/scope-operator.slang +++ b/tests/compute/scope-operator.slang @@ -5,7 +5,7 @@ // Confirm that scoping on enums and types works -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<int> outputBuffer; enum Color diff --git a/tests/compute/select-expr.slang b/tests/compute/select-expr.slang index ae5375e42..85963ca5e 100644 --- a/tests/compute/select-expr.slang +++ b/tests/compute/select-expr.slang @@ -8,7 +8,7 @@ int test(int input) return input > 1 ? -input : input; } -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<int> outputBuffer; [numthreads(4, 1, 1)] diff --git a/tests/compute/semantic.slang b/tests/compute/semantic.slang index 12b0ca853..a3a38e525 100644 --- a/tests/compute/semantic.slang +++ b/tests/compute/semantic.slang @@ -3,7 +3,7 @@ //TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -compute-dispatch 3,1,1 //TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -compute-dispatch 3,1,1 -//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0 0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name outputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0 0 0 0 0], stride=4):out,name outputBuffer RWStructuredBuffer<int> outputBuffer; [numthreads(4, 1, 1)] diff --git a/tests/compute/simple.slang b/tests/compute/simple.slang index 67ed67a6c..e1489d70f 100644 --- a/tests/compute/simple.slang +++ b/tests/compute/simple.slang @@ -3,7 +3,7 @@ // This is a basic test for Slang compute shader. -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<float> outputBuffer; [numthreads(4, 1, 1)] diff --git a/tests/compute/ssa-reduce-bug.slang b/tests/compute/ssa-reduce-bug.slang index 15af36f9f..041fc83c8 100644 --- a/tests/compute/ssa-reduce-bug.slang +++ b/tests/compute/ssa-reduce-bug.slang @@ -2,9 +2,9 @@ //TEST(compute):COMPARE_COMPUTE_EX:-slang -compute //TEST(compute):COMPARE_COMPUTE_EX:-cpu -slang -compute -//TEST_INPUT:ubuffer(data=[0 3 1 2 6 4 7 6], stride=4):dxbinding(0),glbinding(0),name=inputBuffer +//TEST_INPUT:ubuffer(data=[0 3 1 2 6 4 7 6], stride=4):name=inputBuffer RWStructuredBuffer<int> inputBuffer; -//TEST_INPUT:ubuffer(data=[8 8 8 8 8 8 8 8], stride=4):dxbinding(1),glbinding(1),out,name=outputBuffer +//TEST_INPUT:ubuffer(data=[8 8 8 8 8 8 8 8], stride=4):out,name=outputBuffer RWStructuredBuffer<int> outputBuffer; int2 reduce(int2 val) diff --git a/tests/compute/static-const-array.slang b/tests/compute/static-const-array.slang index 242cfb096..4bd197a05 100644 --- a/tests/compute/static-const-array.slang +++ b/tests/compute/static-const-array.slang @@ -4,7 +4,7 @@ //TEST_DISABLED(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out RWStructuredBuffer<int> outputBuffer; static const int kArray[] = { 16, 1, 32, 2 }; diff --git a/tests/compute/struct-default-init.slang b/tests/compute/struct-default-init.slang index 9638465b0..ac01317a1 100644 --- a/tests/compute/struct-default-init.slang +++ b/tests/compute/struct-default-init.slang @@ -25,7 +25,7 @@ int test(int inVal) + t.d; } -//TEST_INPUT:ubuffer(data=[9 9 9 9], stride=4):dxbinding(0),glbinding(0),out +//TEST_INPUT:ubuffer(data=[9 9 9 9], stride=4):out RWStructuredBuffer<int> outputBuffer : register(u0); [numthreads(4, 1, 1)] diff --git a/tests/compute/struct-in-generic.slang b/tests/compute/struct-in-generic.slang index 21e0fecf5..dfcc305f2 100644 --- a/tests/compute/struct-in-generic.slang +++ b/tests/compute/struct-in-generic.slang @@ -1,5 +1,5 @@ //TEST(compute):COMPARE_COMPUTE: -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out // Confirm that a struct type defined in a generic parent works diff --git a/tests/compute/switch-stmt.slang b/tests/compute/switch-stmt.slang index e9ab3ea2f..36aac70a2 100644 --- a/tests/compute/switch-stmt.slang +++ b/tests/compute/switch-stmt.slang @@ -1,5 +1,5 @@ //TEST(compute):COMPARE_COMPUTE: -//TEST_INPUT:ubuffer(data=[0 1 2 3 4 5 6 7], stride=4):dxbinding(0),glbinding(0),out +//TEST_INPUT:ubuffer(data=[0 1 2 3 4 5 6 7], stride=4):out // Test that `swith` statement works diff --git a/tests/compute/tagged-union.slang b/tests/compute/tagged-union.slang index de69232f9..b5219c72a 100644 --- a/tests/compute/tagged-union.slang +++ b/tests/compute/tagged-union.slang @@ -92,10 +92,10 @@ void computeMain // We will thus set up the same data buffer to look like an `A` // value to Vulkan! // -//TEST_INPUT: cbuffer(data=[16 9 1 0 0], stride=4):dxbinding(0),glbinding(0) +//TEST_INPUT: cbuffer(data=[16 9 1 0 0], stride=4): -//TEST_INPUT: ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(1),out +//TEST_INPUT: ubuffer(data=[0 0 0 0], stride=4):out uniform RWStructuredBuffer<int> gOutputBuffer, uint3 dispatchThreadID : SV_DispatchThreadID) { diff --git a/tests/compute/texture-sampling.slang b/tests/compute/texture-sampling.slang index 4ce316807..932e56985 100644 --- a/tests/compute/texture-sampling.slang +++ b/tests/compute/texture-sampling.slang @@ -1,14 +1,14 @@ //TEST(compute):COMPARE_RENDER_COMPUTE: -//TEST_INPUT: Texture1D(size=4, content = one) : dxbinding(0),glbinding(0) -//TEST_INPUT: Texture2D(size=4, content = one) : dxbinding(1),glbinding(1) -//TEST_INPUT: Texture3D(size=4, content = one) : dxbinding(2),glbinding(2) -//TEST_INPUT: TextureCube(size=4, content = one) : dxbinding(3),glbinding(3) -//TEST_INPUT: Texture1D(size=4, content = one, arrayLength=2) : dxbinding(4),glbinding(4) -//TEST_INPUT: Texture2D(size=4, content = one, arrayLength=2) : dxbinding(5),glbinding(5) -//TEST_INPUT: TextureCube(size=4, content = one, arrayLength=2) : dxbinding(6),glbinding(6) -//TEST_INPUT: Sampler : dxbinding(0),glbinding(0,1,2,3,4,5,6) -//TEST_INPUT: ubuffer(data=[0], stride=4):dxbinding(1),glbinding(0),out +//TEST_INPUT: Texture1D(size=4, content = one): +//TEST_INPUT: Texture2D(size=4, content = one): +//TEST_INPUT: Texture3D(size=4, content = one): +//TEST_INPUT: TextureCube(size=4, content = one): +//TEST_INPUT: Texture1D(size=4, content = one, arrayLength=2): +//TEST_INPUT: Texture2D(size=4, content = one, arrayLength=2): +//TEST_INPUT: TextureCube(size=4, content = one, arrayLength=2): +//TEST_INPUT: Sampler: +//TEST_INPUT: ubuffer(data=[0], stride=4):out Texture1D t1D; Texture2D t2D; diff --git a/tests/compute/transitive-interface.slang b/tests/compute/transitive-interface.slang index bb525b9b5..1ee8275e3 100644 --- a/tests/compute/transitive-interface.slang +++ b/tests/compute/transitive-interface.slang @@ -1,5 +1,5 @@ //TEST(compute):COMPARE_COMPUTE: -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out RWStructuredBuffer<int> outputBuffer; diff --git a/tests/compute/type-legalize-global-with-init.slang b/tests/compute/type-legalize-global-with-init.slang index 0763fd897..e668b1a0a 100644 --- a/tests/compute/type-legalize-global-with-init.slang +++ b/tests/compute/type-legalize-global-with-init.slang @@ -6,10 +6,10 @@ // //TEST(compute):COMPARE_COMPUTE: // -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out RWStructuredBuffer<uint> outputBuffer; -//TEST_INPUT:ubuffer(data=[1 2 3 4 5 6 7 8], stride=4):dxbinding(1),glbinding(0) +//TEST_INPUT:ubuffer(data=[1 2 3 4 5 6 7 8], stride=4): RWStructuredBuffer<uint> inputBuffer; static const RWStructuredBuffer<uint> gBuffer = inputBuffer; diff --git a/tests/compute/type-param-varying.slang b/tests/compute/type-param-varying.slang index ef9ae9881..09b97abd1 100644 --- a/tests/compute/type-param-varying.slang +++ b/tests/compute/type-param-varying.slang @@ -1,7 +1,7 @@ //TEST(compute):COMPARE_RENDER_COMPUTE: //TEST_INPUT: global_type AssembledVertex -//TEST_INPUT: ubuffer(data=[0], stride=4):dxbinding(1),glbinding(0),out +//TEST_INPUT: ubuffer(data=[0], stride=4):out // Testing associated types in a varying parameter field diff --git a/tests/compute/typedef-member.slang b/tests/compute/typedef-member.slang index 8ffb9a4c6..c0e044d29 100644 --- a/tests/compute/typedef-member.slang +++ b/tests/compute/typedef-member.slang @@ -1,5 +1,5 @@ //TEST(compute):COMPARE_COMPUTE: -//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out // Confirm that a struct type defined in a generic parent works diff --git a/tests/compute/unbounded-array-of-array-syntax.slang b/tests/compute/unbounded-array-of-array-syntax.slang index df1074896..260c12b2f 100644 --- a/tests/compute/unbounded-array-of-array-syntax.slang +++ b/tests/compute/unbounded-array-of-array-syntax.slang @@ -3,7 +3,7 @@ //TEST:CROSS_COMPILE:-target dxbc-assembly -entry computeMain -profile cs_5_1 //TEST:CROSS_COMPILE:-target spirv-assembly -entry computeMain -profile cs_5_1 -//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name outputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0], stride=4):out,name outputBuffer RWStructuredBuffer<int> outputBuffer; //TEST_INPUT:array(size=2):name g_aoa diff --git a/tests/compute/unbounded-array-of-array.slang b/tests/compute/unbounded-array-of-array.slang index 079808710..4d57b9e94 100644 --- a/tests/compute/unbounded-array-of-array.slang +++ b/tests/compute/unbounded-array-of-array.slang @@ -3,7 +3,7 @@ struct IntAoa { RWStructuredBuffer<int> array[]; } -//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name outputBuffer +//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0], stride=4):out,name outputBuffer RWStructuredBuffer<int> outputBuffer; //TEST_INPUT:array(size=2):name g_aoa.array diff --git a/tests/compute/vector-scalar-compare.slang b/tests/compute/vector-scalar-compare.slang index e8e701dbc..aa9580b5c 100644 --- a/tests/compute/vector-scalar-compare.slang +++ b/tests/compute/vector-scalar-compare.slang @@ -1,6 +1,6 @@ //TEST(compute):COMPARE_COMPUTE:-dx12 -compute //TEST(compute):COMPARE_COMPUTE:-vk -compute -//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0], stride=4):dxbinding(0),glbinding(0),out +//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0], stride=4):out // Test doing vector comparisons RWStructuredBuffer<int> outputBuffer; diff --git a/tests/compute/write-structured-buffer-field.slang b/tests/compute/write-structured-buffer-field.slang index d29a50a0b..7de94aa68 100644 --- a/tests/compute/write-structured-buffer-field.slang +++ b/tests/compute/write-structured-buffer-field.slang @@ -1,6 +1,6 @@ //TEST(compute):COMPARE_COMPUTE: -//TEST_INPUT:ubuffer(data=[1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32], stride=32):dxbinding(0),glbinding(0),out +//TEST_INPUT:ubuffer(data=[1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32], stride=32):out struct S { |