diff options
| author | ArielG-NV <159081215+ArielG-NV@users.noreply.github.com> | 2025-06-30 14:37:40 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-30 21:37:40 +0000 |
| commit | 46d0d97222d34374f45720cbdac1f823e42a4f0d (patch) | |
| tree | f63926dfb21afccb05c9673cdb9a36e2c2665ad0 | |
| parent | f28f67d988158d6c46f7ffe967152f98d32a37b2 (diff) | |
Emit sample index when constructing a `OpImageTexelPointer` (#7563)
* fix #7554
* format code
* test ms and non ms texture
---------
Co-authored-by: slangbot <186143334+slangbot@users.noreply.github.com>
| -rw-r--r-- | source/slang/slang-emit-spirv.cpp | 3 | ||||
| -rw-r--r-- | tests/compute/spirv-array-texel-pointer-atomic.slang | 25 | ||||
| -rw-r--r-- | tests/compute/spirv-multisampled-array-texel-pointer-atomic.slang | 26 |
3 files changed, 53 insertions, 1 deletions
diff --git a/source/slang/slang-emit-spirv.cpp b/source/slang/slang-emit-spirv.cpp index 0a3eb2bf1..dc5352041 100644 --- a/source/slang/slang-emit-spirv.cpp +++ b/source/slang/slang-emit-spirv.cpp @@ -4681,7 +4681,8 @@ struct SPIRVEmitContext : public SourceEmitterBase, public SPIRVEmitSharedContex kResultID, subscript->getImage(), subscript->getCoord(), - builder.getIntValue(builder.getIntType(), 0)); + subscript->hasSampleCoord() ? subscript->getSampleCoord() + : builder.getIntValue(builder.getIntType(), 0)); } SpvInst* emitGetStringHash(IRInst* inst) diff --git a/tests/compute/spirv-array-texel-pointer-atomic.slang b/tests/compute/spirv-array-texel-pointer-atomic.slang new file mode 100644 index 000000000..a0013e284 --- /dev/null +++ b/tests/compute/spirv-array-texel-pointer-atomic.slang @@ -0,0 +1,25 @@ +//TEST:SIMPLE(filecheck=CHECK): -target spirv -entry computeMain -stage compute +//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=BUF): -slang -output-using-type -shaderobj -vk + +//TEST_INPUT: RWTexture2D(format=R32Uint, size=4, content = zero, arrayLength=2, mipMaps = 1):name rwTexture2DArray +[[vk::binding(2)]] +RWTexture2DArray<uint> rwTexture2DArray; + +//TEST_INPUT:ubuffer(data=[0], stride=4):out,name=outputBuffer +RWStructuredBuffer<uint> outputBuffer; + + +[numthreads(1, 1, 1)] +void computeMain(uint3 dispatchThreadID: SV_DispatchThreadID) +{ + uint3 loc = (uint2(0), 0); + uint prevVal; +//CHECK: %{{.*}} = OpImageTexelPointer %{{.*}} %{{.*}} %{{.*}} %int_0 + InterlockedExchange(rwTexture2DArray[loc], 3, prevVal); + outputBuffer[0] = uint(true + && rwTexture2DArray[loc] == 3 + && prevVal == 0 + ); +} + +//BUF: 1
\ No newline at end of file diff --git a/tests/compute/spirv-multisampled-array-texel-pointer-atomic.slang b/tests/compute/spirv-multisampled-array-texel-pointer-atomic.slang new file mode 100644 index 000000000..3e9e4c37a --- /dev/null +++ b/tests/compute/spirv-multisampled-array-texel-pointer-atomic.slang @@ -0,0 +1,26 @@ +//TEST:SIMPLE(filecheck=CHECK): -target spirv -entry computeMain -stage compute +//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=BUF): -slang -output-using-type -shaderobj -vk + +//TEST_INPUT: RWTexture2D(format=R32Uint, size=4, content = zero, arrayLength=2, sampleCount=two, mipMaps = 1):name rwTexture2DMSArray +[[vk::binding(2)]] +RWTexture2DMSArray<uint> rwTexture2DMSArray; + +//TEST_INPUT:ubuffer(data=[0], stride=4):out,name=outputBuffer +RWStructuredBuffer<uint> outputBuffer; + + +[numthreads(1, 1, 1)] +void computeMain(uint3 dispatchThreadID: SV_DispatchThreadID) +{ + uint3 loc = (uint2(0), 0); + uint prevVal; +//CHECK: %{{.*}} = OpImageTexelPointer %{{.*}} %{{.*}} %{{.*}} %int_1 + InterlockedExchange(rwTexture2DMSArray[loc, 1], 3, prevVal); + outputBuffer[0] = uint(true + && rwTexture2DMSArray[loc, 1] == 3 + && rwTexture2DMSArray[loc, 0] == 0 + && prevVal == 0 + ); +} + +//BUF: 1
\ No newline at end of file |