From 2533125cb7c673b313195e1d8bc6066b253d95ae Mon Sep 17 00:00:00 2001 From: Yong He Date: Wed, 6 Nov 2024 11:21:53 -0800 Subject: Fix WGSL parameter block binding. (#5500) * Fix WGSL parameter block binding. * Re-enable tests. * Update failure list. * Fix entrypoint parameters. * Update tests. * Enable stat-var test. --- tests/language-feature/generics/parameter-block-unify.slang | 1 - tests/language-feature/inheritance/struct-inheritance.slang | 1 - .../shader-params/entry-point-uniform-params-implicit.slang | 1 - tests/language-feature/shader-params/entry-point-uniform-params.slang | 4 +--- 4 files changed, 1 insertion(+), 6 deletions(-) (limited to 'tests/language-feature') diff --git a/tests/language-feature/generics/parameter-block-unify.slang b/tests/language-feature/generics/parameter-block-unify.slang index abe2c2030..b549f555b 100644 --- a/tests/language-feature/generics/parameter-block-unify.slang +++ b/tests/language-feature/generics/parameter-block-unify.slang @@ -1,7 +1,6 @@ //TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=CHECK):-slang -compute -shaderobj -output-using-type //TEST(compute, vulkan):COMPARE_COMPUTE_EX(filecheck-buffer=CHECK):-vk -compute -shaderobj -output-using-type //TEST(compute, vulkan):COMPARE_COMPUTE_EX(filecheck-buffer=CHECK):-mtl -compute -shaderobj -output-using-type -render-features argument-buffer-tier-2 -//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-wgpu struct TestStruct { diff --git a/tests/language-feature/inheritance/struct-inheritance.slang b/tests/language-feature/inheritance/struct-inheritance.slang index cc427eea9..e50b1268b 100644 --- a/tests/language-feature/inheritance/struct-inheritance.slang +++ b/tests/language-feature/inheritance/struct-inheritance.slang @@ -1,7 +1,6 @@ // struct-inheritance.slang //TEST(compute):COMPARE_COMPUTE: -shaderobj -//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-wgpu // Test that we can define a `struct` type // that inherits from another `struct`. diff --git a/tests/language-feature/shader-params/entry-point-uniform-params-implicit.slang b/tests/language-feature/shader-params/entry-point-uniform-params-implicit.slang index b5983b5f7..5f8ac7edd 100644 --- a/tests/language-feature/shader-params/entry-point-uniform-params-implicit.slang +++ b/tests/language-feature/shader-params/entry-point-uniform-params-implicit.slang @@ -5,7 +5,6 @@ //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK): -shaderobj -xslang -Wno-38040 //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK): -vk -shaderobj -xslang -Wno-38040 //TEST:SIMPLE(filecheck=WARNING): -target spirv -//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-wgpu struct Data { 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 bcad13e66..082626b03 100644 --- a/tests/language-feature/shader-params/entry-point-uniform-params.slang +++ b/tests/language-feature/shader-params/entry-point-uniform-params.slang @@ -1,11 +1,9 @@ // entry-point-uniform-params.slang - +//TEST(compute):COMPARE_COMPUTE:-wgpu -shaderobj //TEST(compute):COMPARE_COMPUTE: -shaderobj //TEST(compute):COMPARE_COMPUTE:-cuda -shaderobj //TEST(compute):COMPARE_COMPUTE:-cpu -shaderobj //TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -mtl -//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-wgpu - // Test that a shader can be written that // only uses entry point `uniform` parameters, // without any global parameters. -- cgit v1.2.3