Skip to content

Commit 4a8b91e

Browse files
author
Greg Roth
authored
Resolve groupshared test order reporting issue (#3502)
The order of globals() is inconsistent. Since this test depends on that order, it fails sometimes. By removing the individual characterists of the errors, the issue is resolved.
1 parent c3ffca6 commit 4a8b91e

1 file changed

Lines changed: 0 additions & 10 deletions

File tree

tools/clang/test/HLSLFileCheck/hlsl/types/modifiers/groupshared/groupshared_shadermodels.hlsl

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,13 @@ int4 getit()
2929
}
3030

3131
// LIBCHK: error: Thread Group Shared Memory not supported from non-compute entry points.
32-
// LIBCHK: of function 'VSMain'
3332
[shader("vertex")]
3433
float4 VSMain(uint ix : SV_VertexID) : OUT {
3534
output[ix] = getit();
3635
return 1.0;
3736
}
3837

3938
// LIBCHK: error: Thread Group Shared Memory not supported from non-compute entry points.
40-
// LIBCHK: of function 'PSMain'
4139
[shader("pixel")]
4240
float4 PSMain(uint ix : SV_PrimitiveID) : SV_TARGET {
4341
output[ix] = getit();
@@ -75,7 +73,6 @@ struct PosStruct {
7573
float4 a;
7674

7775
// LIBCHK: error: Thread Group Shared Memory not supported from non-compute entry points.
78-
// LIBCHK: of function 'GSMain'
7976
[shader("geometry")]
8077
[maxvertexcount(1)]
8178
void GSMain(triangle float4 array[3] : SV_Position, uint ix : SV_GSInstanceID,
@@ -109,7 +106,6 @@ PCStruct HSPatch(InputPatch<PosStruct, 3> ip,
109106
}
110107

111108
// LIBCHK: error: Thread Group Shared Memory not supported from non-compute entry points.
112-
// LIBCHK: of function 'HSMain'
113109
[shader("hull")]
114110
[domain("tri")]
115111
[partitioning("fractional_odd")]
@@ -126,7 +122,6 @@ PosStruct HSMain(InputPatch<PosStruct, 3> p,
126122
}
127123

128124
// LIBCHK: error: Thread Group Shared Memory not supported from non-compute entry points.
129-
// LIBCHK: of function 'DSMain'
130125
[shader("domain")]
131126
[domain("tri")]
132127
PosStruct DSMain(const OutputPatch<PosStruct, 3> patch,
@@ -157,7 +152,6 @@ struct MyParam {
157152
RaytracingAccelerationStructure RTAS : register(t5);
158153

159154
// LIBCHK: error: Thread Group Shared Memory not supported from non-compute entry points.
160-
// LIBCHK: of function {{.*}}RGMain
161155
[shader("raygeneration")]
162156
void RGMain()
163157
{
@@ -171,7 +165,6 @@ void RGMain()
171165
}
172166

173167
// LIBCHK: error: Thread Group Shared Memory not supported from non-compute entry points.
174-
// LIBCHK: of function {{.*}}ISMain
175168
[shader("intersection")]
176169
void ISMain()
177170
{
@@ -182,7 +175,6 @@ void ISMain()
182175
}
183176

184177
// LIBCHK: error: Thread Group Shared Memory not supported from non-compute entry points.
185-
// LIBCHK: of function {{.*}}AHMain
186178
[shader("anyhit")]
187179
void AHMain( inout MyPayload payload : SV_RayPayload,
188180
in MyAttributes attr : SV_IntersectionAttributes )
@@ -196,7 +188,6 @@ void AHMain( inout MyPayload payload : SV_RayPayload,
196188
}
197189

198190
// LIBCHK: error: Thread Group Shared Memory not supported from non-compute entry points.
199-
// LIBCHK: of function {{.*}}CHMain
200191
[shader("closesthit")]
201192
void CHMain( inout MyPayload payload : SV_RayPayload,
202193
in BuiltInTriangleIntersectionAttributes attr : SV_IntersectionAttributes )
@@ -208,7 +199,6 @@ void CHMain( inout MyPayload payload : SV_RayPayload,
208199

209200

210201
// LIBCHK: error: Thread Group Shared Memory not supported from non-compute entry points.
211-
// LIBCHK: of function {{.*}}MissMain
212202
[shader("miss")]
213203
void MissMain(inout MyPayload payload : SV_RayPayload)
214204
{

0 commit comments

Comments
 (0)