diff options
| author | Yong He <yonghe@outlook.com> | 2021-08-17 09:39:02 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-17 09:39:02 -0700 |
| commit | 858c7c57b125afed9b5b2329d6b02477284e4803 (patch) | |
| tree | 49f67b342448dcfb19913d8ccc089d956de14462 /tests | |
| parent | 6406523511037987d8b8ab881aea41389afd57eb (diff) | |
Add GLSL450 intrinsics to SPIRV direct emit. (#1921)
* Add GLSL450 intrinsics to SPIRV direct emit.
* Fix.
* Fix compiler error.
* Fix.
* Fix compiler error.
* Make direct-spirv tests actually run.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/hlsl-intrinsic/scalar-float.slang | 1 | ||||
| -rw-r--r-- | tests/spirv/direct-spirv-compute-simple.slang | 4 | ||||
| -rw-r--r-- | tests/spirv/direct-spirv-control-flow-2.slang | 3 | ||||
| -rw-r--r-- | tests/spirv/direct-spirv-control-flow.slang | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/tests/hlsl-intrinsic/scalar-float.slang b/tests/hlsl-intrinsic/scalar-float.slang index 062f6c94b..a5756b01b 100644 --- a/tests/hlsl-intrinsic/scalar-float.slang +++ b/tests/hlsl-intrinsic/scalar-float.slang @@ -2,6 +2,7 @@ //TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -shaderobj //TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -shaderobj //TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj +//DISABLED_TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj -emit-spirv-directly //TEST(compute, vulkan):COMPARE_COMPUTE_EX:-cuda -compute -shaderobj //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer diff --git a/tests/spirv/direct-spirv-compute-simple.slang b/tests/spirv/direct-spirv-compute-simple.slang index 39b9074ed..2fa2798e5 100644 --- a/tests/spirv/direct-spirv-compute-simple.slang +++ b/tests/spirv/direct-spirv-compute-simple.slang @@ -1,6 +1,6 @@ // direct-spirv-compute-simple.slang - -//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -xslang -emit-spirv-directly +//TESTD:SIMPLE:-target spirv -entry computeMain -stage compute -emit-spirv-directly +//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -emit-spirv-directly // Test runinng a shader generated from direct SPIR-V emit. diff --git a/tests/spirv/direct-spirv-control-flow-2.slang b/tests/spirv/direct-spirv-control-flow-2.slang index cc908100e..7dd829bda 100644 --- a/tests/spirv/direct-spirv-control-flow-2.slang +++ b/tests/spirv/direct-spirv-control-flow-2.slang @@ -1,6 +1,7 @@ // direct-spirv-control-flow-2.slang -//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -output-using-type -xslang -emit-spirv-directly +//TESTD:SIMPLE:-target spirv -entry computeMain -stage compute -emit-spirv-directly +//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -output-using-type -emit-spirv-directly // Test direct SPIR-V emit on control flows. diff --git a/tests/spirv/direct-spirv-control-flow.slang b/tests/spirv/direct-spirv-control-flow.slang index 9efddeb12..10bee2522 100644 --- a/tests/spirv/direct-spirv-control-flow.slang +++ b/tests/spirv/direct-spirv-control-flow.slang @@ -1,6 +1,6 @@ // direct-spirv-control-flow.slang -//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -xslang -emit-spirv-directly +//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -emit-spirv-directly // Test direct SPIRV emit on control fl. |