Skip to content

Commit 33e81a0

Browse files
authored
[Metal] Fix global constant array emit. (shader-slang#4392)
* [Metal] Fix global constant array emit. * Try enable more tests.
1 parent a38a4fb commit 33e81a0

4 files changed

+5
-6
lines changed

source/slang/slang-emit-c-like.cpp

+5-3
Original file line numberDiff line numberDiff line change
@@ -1852,14 +1852,16 @@ void CLikeSourceEmitter::emitInstResultDecl(IRInst* inst)
18521852
case SourceLanguage::HLSL:
18531853
case SourceLanguage::C:
18541854
case SourceLanguage::CPP:
1855-
m_writer->emit("static ");
1855+
m_writer->emit("static const ");
1856+
break;
1857+
case SourceLanguage::Metal:
1858+
m_writer->emit("constant ");
18561859
break;
1857-
18581860
default:
1861+
m_writer->emit("const ");
18591862
break;
18601863
}
18611864

1862-
m_writer->emit("const ");
18631865
}
18641866

18651867
emitType(type, getName(inst));

tests/compute/static-const-array.slang

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -shaderobj
44
//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj
55
//TEST(compute):COMPARE_COMPUTE_EX:-cpu -slang -compute -shaderobj
6-
//DISABLE_TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -mtl
76

87
//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out, name outputBuffer
98
RWStructuredBuffer<int> outputBuffer;

tests/compute/static-const-matrix-array.slang

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -output-using-type -shaderobj
44
//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -output-using-type -shaderobj
55
//TEST(compute):COMPARE_COMPUTE_EX:-cpu -slang -compute -output-using-type -shaderobj
6-
//DISABLE_TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -mtl
76

87
//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0], stride=4):out, name outputBuffer
98
RWStructuredBuffer<float> outputBuffer;

tests/compute/static-const-vector-array.slang

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -output-using-type -shaderobj
44
//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -output-using-type -shaderobj
55
//TEST(compute):COMPARE_COMPUTE_EX:-cpu -slang -compute -output-using-type -shaderobj
6-
//DISABLE_TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -mtl
76

87
//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0], stride=4):out, name outputBuffer
98
RWStructuredBuffer<float> outputBuffer;

0 commit comments

Comments
 (0)