diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/compute/array-existential-parameter.slang | 2 | ||||
| -rw-r--r-- | tests/compute/cbuffer-legalize.slang | 2 | ||||
| -rw-r--r-- | tests/compute/entry-point-uniform-params.slang | 4 | ||||
| -rw-r--r-- | tests/compute/global-type-param-in-entrypoint.slang | 2 | ||||
| -rw-r--r-- | tests/compute/interface-param-partial-specialize.slang | 11 | ||||
| -rw-r--r-- | tests/disabled-tests.txt | 2 | ||||
| -rw-r--r-- | tests/language-feature/shader-params/entry-point-uniform-params.slang | 2 |
7 files changed, 16 insertions, 9 deletions
diff --git a/tests/compute/array-existential-parameter.slang b/tests/compute/array-existential-parameter.slang index f640ba752..fc697969d 100644 --- a/tests/compute/array-existential-parameter.slang +++ b/tests/compute/array-existential-parameter.slang @@ -1,6 +1,6 @@ // Test using existential shader parameter that is an interface array. -//TEST(compute):COMPARE_COMPUTE:-cpu +//DISABLED_TEST(compute):COMPARE_COMPUTE:-cpu //DISABLE_TEST(compute):COMPARE_COMPUTE:-cuda [anyValueSize(8)] diff --git a/tests/compute/cbuffer-legalize.slang b/tests/compute/cbuffer-legalize.slang index 3941a8de3..7233f71d6 100644 --- a/tests/compute/cbuffer-legalize.slang +++ b/tests/compute/cbuffer-legalize.slang @@ -1,7 +1,7 @@ //TEST(compute):COMPARE_COMPUTE:-cpu -shaderobj //TEST(compute):COMPARE_COMPUTE:-shaderobj -//TEST_INPUT: Uniform(data=[1 2 3 4]):name=C.p.c +//TEST_INPUT: uniform(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 diff --git a/tests/compute/entry-point-uniform-params.slang b/tests/compute/entry-point-uniform-params.slang index 1ed9a0646..f97874696 100644 --- a/tests/compute/entry-point-uniform-params.slang +++ b/tests/compute/entry-point-uniform-params.slang @@ -35,9 +35,9 @@ ConstantBuffer<Signs> signs; [numthreads(4, 1, 1)] void computeMain( -//TEST_INPUT:root_constants(data=[2 0 0 0 3 0 0 0]):name=stuff +//TEST_INPUT:uniform(data=[2]):name=stuff uniform Stuff stuff, -//TEST_INPUT:root_constants(data=[3]):onlyCPULikeBinding,name=things +//TEST_INPUT:uniform(data=[3]):name=things uniform Things things, //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer diff --git a/tests/compute/global-type-param-in-entrypoint.slang b/tests/compute/global-type-param-in-entrypoint.slang index a82cd88bc..24ee113f5 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: -shaderobj -//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):name Uniforms +//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]):name Uniforms //TEST_INPUT: ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer //TEST_INPUT: global_type VertImpl diff --git a/tests/compute/interface-param-partial-specialize.slang b/tests/compute/interface-param-partial-specialize.slang index f81a1cdb7..9be22c6c4 100644 --- a/tests/compute/interface-param-partial-specialize.slang +++ b/tests/compute/interface-param-partial-specialize.slang @@ -3,8 +3,8 @@ // with __Dynamic. This verifies that the handling of // "partially" specializing an existential type is correct. -//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -cuda -shaderobj -//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -cpu -shaderobj +//DISABLED_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -cuda -shaderobj +//DISABLED_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -cpu -shaderobj [anyValueSize(8)] interface IInterface @@ -38,7 +38,12 @@ void compute(uint tid, Params p) [numthreads(4, 1, 1)] void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID, -//TEST_INPUT:ubuffer(data=[rtti(Impl) witness(Impl, IInterface) 1 0], stride=4):name=params.obj + +//TEST_INPUT:begin_buffer(stride=8):name=params.obj +//TEST_INPUT:begin_object(type=Impl) +//TEST_INPUT:uniform(data=[1]):name=val +//TEST_INPUT:end +//TEST_INPUT:end uniform Params params) { uint tid = dispatchThreadID.x; diff --git a/tests/disabled-tests.txt b/tests/disabled-tests.txt index 69538a7de..ffc9736db 100644 --- a/tests/disabled-tests.txt +++ b/tests/disabled-tests.txt @@ -39,3 +39,5 @@ These tests will need to be re-enabled together with changes to the shader objec * render/render0.hlsl * render/tess.hlsl * render/unused-discard.hlsl +* compute/interface-param-partial-specialize.slang +* compute/array-existential-parameter.slang diff --git a/tests/language-feature/shader-params/entry-point-uniform-params.slang b/tests/language-feature/shader-params/entry-point-uniform-params.slang index 9bcb36f27..5b0279bb5 100644 --- a/tests/language-feature/shader-params/entry-point-uniform-params.slang +++ b/tests/language-feature/shader-params/entry-point-uniform-params.slang @@ -23,7 +23,7 @@ int test(int val, int a, int b) [shader("compute")] void computeMain( -//TEST_INPUT:root_constants(data=[256 1]):name=d +//TEST_INPUT:uniform(data=[256 1]):name=d uniform Data d, //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer |