Skip to content

Commit 1ad2034

Browse files
Peter McNeeleyDawn LUCI CQ
authored andcommitted
[dawn] Minor negation error in support arch limits test
Bug: 430344935 Change-Id: Idb6a7e599ab86e48668c87a7a5d35ea9f06cfe61 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/259555 Reviewed-by: James Price <[email protected]> Commit-Queue: Peter McNeeley <[email protected]>
1 parent 011e49c commit 1ad2034

File tree

1 file changed

+7
-16
lines changed

1 file changed

+7
-16
lines changed

src/dawn/tests/end2end/SupportedFeatureArch.cpp

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,7 @@ TEST_P(FeatureArchInfoTest_MaxLimits, WorkgroupSizeMin1024Expected) {
9292
gpu_info::IsNvidia(GetParam().adapterProperties.vendorID);
9393
DAWN_TEST_UNSUPPORTED_IF(!isWorkgroupSizeGT1k);
9494

95-
EXPECT_GE(GetAdapterLimits().maxComputeInvocationsPerWorkgroup, 1024u);
96-
// Check that the device was created with the requested limit.
97-
EXPECT_EQ(GetSupportedLimits().maxComputeInvocationsPerWorkgroup,
98-
GetAdapterLimits().maxComputeInvocationsPerWorkgroup);
95+
EXPECT_GE(GetSupportedLimits().maxComputeInvocationsPerWorkgroup, 1024u);
9996
}
10097

10198
class FeatureArchInfoTest_TieredMaxLimits : public FeatureArchInfoTestBase {
@@ -114,7 +111,7 @@ TEST_P(FeatureArchInfoTest_TieredMaxLimits, D3DHighMaxVertexAttributes) {
114111

115112
// High-end windows desktop GPU should report at least 30 even when tiered is enabled
116113
// See crbug.com/430371785
117-
EXPECT_GE(GetAdapterLimits().maxVertexAttributes, 30u);
114+
EXPECT_GE(GetSupportedLimits().maxVertexAttributes, 30u);
118115
}
119116

120117
TEST_P(FeatureArchInfoTest_TieredMaxLimits, AppleMaxTextureDimension2D) {
@@ -123,24 +120,18 @@ TEST_P(FeatureArchInfoTest_TieredMaxLimits, AppleMaxTextureDimension2D) {
123120

124121
// Apple silicon should report > 16k. Most modern devices should support > 16k. Update this when
125122
// appropriate.
126-
EXPECT_GE(GetAdapterLimits().maxTextureDimension2D, 16384u);
123+
EXPECT_GE(GetSupportedLimits().maxTextureDimension2D, 16384u);
127124
}
128125

129126
TEST_P(FeatureArchInfoTest_TieredMaxLimits, MaxUniformBufferBindingSize) {
130127
// Swiftshader will return a lower limit than any modern device on CQ.
131-
DAWN_TEST_UNSUPPORTED_IF(!IsSwiftshader());
132-
EXPECT_GE(GetAdapterLimits().maxUniformBufferBindingSize, 65536u);
133-
// Check that the device was created with the requested limit.
134-
EXPECT_EQ(GetSupportedLimits().maxUniformBufferBindingSize,
135-
GetAdapterLimits().maxUniformBufferBindingSize);
128+
DAWN_TEST_UNSUPPORTED_IF(IsSwiftshader() || IsANGLESwiftShader());
129+
EXPECT_EQ(GetSupportedLimits().maxUniformBufferBindingSize, 65536u);
136130
}
137131

138132
TEST_P(FeatureArchInfoTest_MaxLimits, MinUniformBufferOffsetAlignment) {
139133
// All devices on CQ report 256. A value of 32 is commonplace on iOS (note the less than).
140-
EXPECT_LE(GetAdapterLimits().minUniformBufferOffsetAlignment, 256u);
141-
// Check that the device was created with the requested limit.
142-
EXPECT_EQ(GetSupportedLimits().minUniformBufferOffsetAlignment,
143-
GetAdapterLimits().minUniformBufferOffsetAlignment);
134+
EXPECT_LE(GetSupportedLimits().minUniformBufferOffsetAlignment, 256u);
144135
}
145136

146137
TEST_P(FeatureArchInfoTest_TieredMaxLimits, D3DHighMaxDynamicUniformBuffersPerPipelineLayout) {
@@ -150,7 +141,7 @@ TEST_P(FeatureArchInfoTest_TieredMaxLimits, D3DHighMaxDynamicUniformBuffersPerPi
150141

151142
// High-end windows desktop GPU should report at least 10 even when tiered is enabled
152143
// See crbug.com/440381283
153-
EXPECT_GE(GetAdapterLimits().maxDynamicUniformBuffersPerPipelineLayout, 10u);
144+
EXPECT_GE(GetSupportedLimits().maxDynamicUniformBuffersPerPipelineLayout, 10u);
154145
}
155146

156147
DAWN_INSTANTIATE_TEST(FeatureArchInfoTest_MaxLimits,

0 commit comments

Comments
 (0)