diff options
| author | Yong He <yonghe@outlook.com> | 2024-06-14 00:56:52 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-14 00:56:52 -0700 |
| commit | 33e81a03115dad223b244ca689e2abdbf26641f7 (patch) | |
| tree | 964715d12e0311fa139193a7444dab6ca0c508a1 | |
| parent | a38a4fb21d7925e8cee46923bff0500ed7f7856e (diff) | |
[Metal] Fix global constant array emit. (#4392)
* [Metal] Fix global constant array emit.
* Try enable more tests.
| -rw-r--r-- | source/slang/slang-emit-c-like.cpp | 8 | ||||
| -rw-r--r-- | tests/compute/static-const-array.slang | 1 | ||||
| -rw-r--r-- | tests/compute/static-const-matrix-array.slang | 1 | ||||
| -rw-r--r-- | tests/compute/static-const-vector-array.slang | 1 |
4 files changed, 5 insertions, 6 deletions
diff --git a/source/slang/slang-emit-c-like.cpp b/source/slang/slang-emit-c-like.cpp index 448a67bb9..e9ab58bca 100644 --- a/source/slang/slang-emit-c-like.cpp +++ b/source/slang/slang-emit-c-like.cpp @@ -1852,14 +1852,16 @@ void CLikeSourceEmitter::emitInstResultDecl(IRInst* inst) case SourceLanguage::HLSL: case SourceLanguage::C: case SourceLanguage::CPP: - m_writer->emit("static "); + m_writer->emit("static const "); + break; + case SourceLanguage::Metal: + m_writer->emit("constant "); break; - default: + m_writer->emit("const "); break; } - m_writer->emit("const "); } emitType(type, getName(inst)); diff --git a/tests/compute/static-const-array.slang b/tests/compute/static-const-array.slang index 48c47bea1..62533cc06 100644 --- a/tests/compute/static-const-array.slang +++ b/tests/compute/static-const-array.slang @@ -3,7 +3,6 @@ //TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -shaderobj //TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj //TEST(compute):COMPARE_COMPUTE_EX:-cpu -slang -compute -shaderobj -//DISABLE_TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -mtl //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out, name outputBuffer RWStructuredBuffer<int> outputBuffer; diff --git a/tests/compute/static-const-matrix-array.slang b/tests/compute/static-const-matrix-array.slang index b2c5f80a0..9cd68f83a 100644 --- a/tests/compute/static-const-matrix-array.slang +++ b/tests/compute/static-const-matrix-array.slang @@ -3,7 +3,6 @@ //TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -output-using-type -shaderobj //TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -output-using-type -shaderobj //TEST(compute):COMPARE_COMPUTE_EX:-cpu -slang -compute -output-using-type -shaderobj -//DISABLE_TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -mtl //TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0], stride=4):out, name outputBuffer RWStructuredBuffer<float> outputBuffer; diff --git a/tests/compute/static-const-vector-array.slang b/tests/compute/static-const-vector-array.slang index 35ad8283c..02f3d49dd 100644 --- a/tests/compute/static-const-vector-array.slang +++ b/tests/compute/static-const-vector-array.slang @@ -3,7 +3,6 @@ //TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -output-using-type -shaderobj //TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -output-using-type -shaderobj //TEST(compute):COMPARE_COMPUTE_EX:-cpu -slang -compute -output-using-type -shaderobj -//DISABLE_TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -mtl //TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0], stride=4):out, name outputBuffer RWStructuredBuffer<float> outputBuffer; |