Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit cb7e738

Browse files
y-novikovCommit Bot
authored andcommitted
Remove 32-bit Subzero GLES31 SwANGLE suppressions
Remaining Windows crashes fixed by https://swiftshader-review.googlesource.com/c/SwiftShader/+/42608 Bug: angleproject:4482 Change-Id: If1d6b6c4bd172c36108d31e01f561e001f49683f Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2113716 Reviewed-by: Yuly Novikov <[email protected]> Commit-Queue: Yuly Novikov <[email protected]>
1 parent 6b46212 commit cb7e738

File tree

2 files changed

+0
-58
lines changed

2 files changed

+0
-58
lines changed

src/tests/deqp_support/deqp_gles31_test_expectations.txt

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -191,19 +191,6 @@
191191
3881 VULKAN : dEQP-GLES31.functional.program_interface_query.uniform.location.default_block.array.array.image_2d = SKIP
192192
3881 VULKAN : dEQP-GLES31.functional.program_interface_query.uniform.location.default_block.array.array.iimage_2d_array = SKIP
193193

194-
// Crashes in Windows x86 Subzero Reactor
195-
4482 WIN SWIFTSHADER : dEQP-GLES31.functional.compute.basic.shared_atomic_op_* = SKIP
196-
4482 WIN SWIFTSHADER : dEQP-GLES31.functional.compute.basic.shared_var_* = SKIP
197-
4482 WIN SWIFTSHADER : dEQP-GLES31.functional.compute.basic.ssbo_local_barrier_* = SKIP
198-
4482 WIN SWIFTSHADER : dEQP-GLES31.functional.compute.shared_var.* = SKIP
199-
4482 WIN SWIFTSHADER : dEQP-GLES31.functional.image_load_store.2d.qualifiers.* = SKIP
200-
4482 WIN SWIFTSHADER : dEQP-GLES31.functional.image_load_store.2d_array.qualifiers.* = SKIP
201-
4482 WIN SWIFTSHADER : dEQP-GLES31.functional.image_load_store.3d.qualifiers.* = SKIP
202-
4482 WIN SWIFTSHADER : dEQP-GLES31.functional.image_load_store.cube.qualifiers.* = SKIP
203-
4482 WIN SWIFTSHADER : dEQP-GLES31.functional.ssbo.atomic.compswap.* = SKIP
204-
4482 WIN SWIFTSHADER : dEQP-GLES31.functional.synchronization.inter_invocation.* = SKIP
205-
206-
207194
////
208195
//// General Vulkan expectations
209196
////

src/tests/gl_tests/ComputeShaderTest.cpp

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1721,11 +1721,6 @@ void main()
17211721
// order of multiple shader invocations in compute shader.
17221722
TEST_P(ComputeShaderTest, groupMemoryBarrierAndBarrierTest)
17231723
{
1724-
// Crashes on Windows 32-bit SwiftShader Subzero. http://anglebug.com/4482
1725-
#if defined(ANGLE_IS_32_BIT_CPU)
1726-
ANGLE_SKIP_TEST_IF(isSwiftshader() && IsWindows());
1727-
#endif
1728-
17291724
// TODO([email protected]): Figure out why we get this error message
17301725
// that shader uses features not recognized by this D3D version.
17311726
ANGLE_SKIP_TEST_IF((IsAMD() || IsNVIDIA()) && IsD3D11());
@@ -1887,11 +1882,6 @@ void main()
18871882
// Verify shared non-array variables can work correctly.
18881883
TEST_P(ComputeShaderTest, NonArraySharedVariable)
18891884
{
1890-
// Crashes on Windows 32-bit SwiftShader Subzero. http://anglebug.com/4482
1891-
#if defined(ANGLE_IS_32_BIT_CPU)
1892-
ANGLE_SKIP_TEST_IF(isSwiftshader() && IsWindows());
1893-
#endif
1894-
18951885
const char kCSShader[] = R"(#version 310 es
18961886
layout (local_size_x = 2, local_size_y = 2, local_size_z = 1) in;
18971887
layout (r32ui, binding = 0) readonly uniform highp uimage2D srcImage;
@@ -1925,11 +1915,6 @@ void main()
19251915
// Verify shared non-struct array variables can work correctly.
19261916
TEST_P(ComputeShaderTest, NonStructArrayAsSharedVariable)
19271917
{
1928-
// Crashes on Windows 32-bit SwiftShader Subzero. http://anglebug.com/4482
1929-
#if defined(ANGLE_IS_32_BIT_CPU)
1930-
ANGLE_SKIP_TEST_IF(isSwiftshader() && IsWindows());
1931-
#endif
1932-
19331918
const char kCSShader[] = R"(#version 310 es
19341919
layout (local_size_x = 2, local_size_y = 2, local_size_z = 1) in;
19351920
layout (r32ui, binding = 0) readonly uniform highp uimage2D srcImage;
@@ -1954,11 +1939,6 @@ void main()
19541939
// Verify shared struct array variables work correctly.
19551940
TEST_P(ComputeShaderTest, StructArrayAsSharedVariable)
19561941
{
1957-
// Crashes on Windows 32-bit SwiftShader Subzero. http://anglebug.com/4482
1958-
#if defined(ANGLE_IS_32_BIT_CPU)
1959-
ANGLE_SKIP_TEST_IF(isSwiftshader() && IsWindows());
1960-
#endif
1961-
19621942
const char kCSShader[] = R"(#version 310 es
19631943
layout (local_size_x = 2, local_size_y = 2, local_size_z = 1) in;
19641944
layout (r32ui, binding = 0) readonly uniform highp uimage2D srcImage;
@@ -1987,11 +1967,6 @@ void main()
19871967
// Verify using atomic functions without return value can work correctly.
19881968
TEST_P(ComputeShaderTest, AtomicFunctionsNoReturnValue)
19891969
{
1990-
// Crashes on Windows 32-bit SwiftShader Subzero. http://anglebug.com/4482
1991-
#if defined(ANGLE_IS_32_BIT_CPU)
1992-
ANGLE_SKIP_TEST_IF(isSwiftshader() && IsWindows());
1993-
#endif
1994-
19951970
// Fails on AMD windows drivers. http://anglebug.com/3872
19961971
ANGLE_SKIP_TEST_IF(IsWindows() && IsAMD() && IsVulkan());
19971972

@@ -2058,11 +2033,6 @@ void main()
20582033
// Verify using atomic functions in a non-initializer single assignment can work correctly.
20592034
TEST_P(ComputeShaderTest, AtomicFunctionsInNonInitializerSingleAssignment)
20602035
{
2061-
// Crashes on Windows 32-bit SwiftShader Subzero. http://anglebug.com/4482
2062-
#if defined(ANGLE_IS_32_BIT_CPU)
2063-
ANGLE_SKIP_TEST_IF(isSwiftshader() && IsWindows());
2064-
#endif
2065-
20662036
// Fails on AMD windows drivers. http://anglebug.com/3872
20672037
ANGLE_SKIP_TEST_IF(IsWindows() && IsAMD() && IsVulkan());
20682038

@@ -2112,11 +2082,6 @@ void main()
21122082
// Verify using atomic functions in an initializers and using unsigned int works correctly.
21132083
TEST_P(ComputeShaderTest, AtomicFunctionsInitializerWithUnsigned)
21142084
{
2115-
// Crashes on Windows 32-bit SwiftShader Subzero. http://anglebug.com/4482
2116-
#if defined(ANGLE_IS_32_BIT_CPU)
2117-
ANGLE_SKIP_TEST_IF(isSwiftshader() && IsWindows());
2118-
#endif
2119-
21202085
// Fails on AMD windows drivers. http://anglebug.com/3872
21212086
ANGLE_SKIP_TEST_IF(IsWindows() && IsAMD() && IsVulkan());
21222087

@@ -2177,11 +2142,6 @@ void main()
21772142
// Verify using atomic functions inside expressions as unsigned int.
21782143
TEST_P(ComputeShaderTest, AtomicFunctionsReturnWithUnsigned)
21792144
{
2180-
// Crashes on Windows 32-bit SwiftShader Subzero. http://anglebug.com/4482
2181-
#if defined(ANGLE_IS_32_BIT_CPU)
2182-
ANGLE_SKIP_TEST_IF(isSwiftshader() && IsWindows());
2183-
#endif
2184-
21852145
// Fails on AMD windows drivers. http://anglebug.com/3872
21862146
ANGLE_SKIP_TEST_IF(IsWindows() && IsAMD() && IsVulkan());
21872147

@@ -2232,11 +2192,6 @@ void main()
22322192
// Verify using nested atomic functions in expressions.
22332193
TEST_P(ComputeShaderTest, AtomicFunctionsReturnWithMultipleTypes)
22342194
{
2235-
// Crashes on Windows 32-bit SwiftShader Subzero. http://anglebug.com/4482
2236-
#if defined(ANGLE_IS_32_BIT_CPU)
2237-
ANGLE_SKIP_TEST_IF(isSwiftshader() && IsWindows());
2238-
#endif
2239-
22402195
constexpr char kCShader[] = R"(#version 310 es
22412196
layout (local_size_x = 4, local_size_y = 1, local_size_z = 1) in;
22422197
layout (r32ui, binding = 0) readonly uniform highp uimage2D srcImage;

0 commit comments

Comments
 (0)