Skip to content

Commit de454b0

Browse files
authored
Fix Texture2DMSArray (shader-slang#4485)
* Fix Texture2DMSArray Close shader-slang#4427 We had the postfix order wrong for the keyword MS. This commit changes the incorrect name Texture2DArrayMS to Texture2DMSArray.
1 parent e1d0ef2 commit de454b0

File tree

3 files changed

+8
-10
lines changed

3 files changed

+8
-10
lines changed

source/slang/glsl.meta.slang

-2
Original file line numberDiff line numberDiff line change
@@ -1636,8 +1636,6 @@ public typealias sampler2DMS = Sampler2DMS<float4>;
16361636
public typealias isampler2DMS = Sampler2DMS<int4>;
16371637
public typealias usampler2DMS = Sampler2DMS<uint4>;
16381638

1639-
__generic<T=float4, let sampleCount:int=0, let format:int=0>
1640-
public typealias Sampler2DMSArray = Sampler2DArrayMS<T, sampleCount, format>;
16411639
public typealias sampler2DMSArray = Sampler2DMSArray<float4>;
16421640
public typealias isampler2DMSArray = Sampler2DMSArray<int4>;
16431641
public typealias usampler2DMSArray = Sampler2DMSArray<uint4>;

source/slang/hlsl.meta.slang

+1-1
Original file line numberDiff line numberDiff line change
@@ -3231,7 +3231,7 @@ ${{{{
32313231
auto requireString = requireStringBuilder.toString();
32323232
}}}}
32333233
$(requireString)
3234-
typealias $(accessPrefix[access])$(textureTypeName)$(shapeTypeNames[shape])$(arrayPostFix[isArray])$(msPostFix[isMS])<T=float4, let sampleCount:int=0, let format:int=0> = __TextureImpl<T, __Shape$(shapeTypeNames[shape]), $(isArray), $(isMS), sampleCount, $(access), 0, $(isCombined), format>;
3234+
typealias $(accessPrefix[access])$(textureTypeName)$(shapeTypeNames[shape])$(msPostFix[isMS])$(arrayPostFix[isArray])<T=float4, let sampleCount:int=0, let format:int=0> = __TextureImpl<T, __Shape$(shapeTypeNames[shape]), $(isArray), $(isMS), sampleCount, $(access), 0, $(isCombined), format>;
32353235
${{{{
32363236
}
32373237
}}}}

tests/compute/texture-subscript-multisample.slang

+7-7
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
//TEST_INPUT: RWTexture2D(format=R8G8B8A8_SINT, size=4, content = zero, sampleCount=two, mipMaps = 1):name outputTexture2DMS
1313
RWTexture2DMS<int4> outputTexture2DMS;
1414

15-
//TEST_INPUT: RWTexture2D(format=R8G8B8A8_SINT, size=4, content = zero, arrayLength=2, sampleCount=two, mipMaps = 1):name outputTexture2DArrayMS
16-
RWTexture2DArrayMS<int4> outputTexture2DArrayMS;
15+
//TEST_INPUT: RWTexture2D(format=R8G8B8A8_SINT, size=4, content = zero, arrayLength=2, sampleCount=two, mipMaps = 1):name outputTexture2DMSArray
16+
RWTexture2DMSArray<int4> outputTexture2DMSArray;
1717

1818
//TEST_INPUT:ubuffer(data=[0], stride=4):out,name=outputBuffer
1919
RWStructuredBuffer<uint> outputBuffer;
@@ -26,16 +26,16 @@ void computeMain()
2626
outputTexture2DMS[0, 0].xz = int2(1,2);
2727
outputTexture2DMS[int2(0, 0), 1].xz = int2(3,4);
2828

29-
outputTexture2DArrayMS[0, 0].xz = int2(1,2);
30-
outputTexture2DArrayMS[int3(0, 0, 1), 1].xz = int2(3,4);
29+
outputTexture2DMSArray[0, 0].xz = int2(1,2);
30+
outputTexture2DMSArray[int3(0, 0, 1), 1].xz = int2(3,4);
3131

3232
outputBuffer[0] = uint(true
3333
&& all(outputTexture2DMS[0, 0] == int4(1, 0, 2, 0)) == true
3434
&& all(outputTexture2DMS[int2(0, 0), 1] == int4(3, 0, 4, 0)) == true
3535

36-
&& all(outputTexture2DArrayMS[0, 0] == int4(1, 0, 2, 0)) == true
37-
&& all(outputTexture2DArrayMS[int3(0, 0, 1), 1] == int4(3, 0, 4, 0)) == true
36+
&& all(outputTexture2DMSArray[0, 0] == int4(1, 0, 2, 0)) == true
37+
&& all(outputTexture2DMSArray[int3(0, 0, 1), 1] == int4(3, 0, 4, 0)) == true
3838
);
3939
}
4040

41-
//BUF: 1
41+
//BUF: 1

0 commit comments

Comments
 (0)