Commit cb7e7387 by Yuly Novikov Committed by Commit Bot

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/+/2113716Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org> Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
parent 6b462120
...@@ -191,19 +191,6 @@ ...@@ -191,19 +191,6 @@
3881 VULKAN : dEQP-GLES31.functional.program_interface_query.uniform.location.default_block.array.array.image_2d = SKIP 3881 VULKAN : dEQP-GLES31.functional.program_interface_query.uniform.location.default_block.array.array.image_2d = SKIP
3881 VULKAN : dEQP-GLES31.functional.program_interface_query.uniform.location.default_block.array.array.iimage_2d_array = SKIP 3881 VULKAN : dEQP-GLES31.functional.program_interface_query.uniform.location.default_block.array.array.iimage_2d_array = SKIP
// Crashes in Windows x86 Subzero Reactor
4482 WIN SWIFTSHADER : dEQP-GLES31.functional.compute.basic.shared_atomic_op_* = SKIP
4482 WIN SWIFTSHADER : dEQP-GLES31.functional.compute.basic.shared_var_* = SKIP
4482 WIN SWIFTSHADER : dEQP-GLES31.functional.compute.basic.ssbo_local_barrier_* = SKIP
4482 WIN SWIFTSHADER : dEQP-GLES31.functional.compute.shared_var.* = SKIP
4482 WIN SWIFTSHADER : dEQP-GLES31.functional.image_load_store.2d.qualifiers.* = SKIP
4482 WIN SWIFTSHADER : dEQP-GLES31.functional.image_load_store.2d_array.qualifiers.* = SKIP
4482 WIN SWIFTSHADER : dEQP-GLES31.functional.image_load_store.3d.qualifiers.* = SKIP
4482 WIN SWIFTSHADER : dEQP-GLES31.functional.image_load_store.cube.qualifiers.* = SKIP
4482 WIN SWIFTSHADER : dEQP-GLES31.functional.ssbo.atomic.compswap.* = SKIP
4482 WIN SWIFTSHADER : dEQP-GLES31.functional.synchronization.inter_invocation.* = SKIP
//// ////
//// General Vulkan expectations //// General Vulkan expectations
//// ////
......
...@@ -1721,11 +1721,6 @@ void main() ...@@ -1721,11 +1721,6 @@ void main()
// order of multiple shader invocations in compute shader. // order of multiple shader invocations in compute shader.
TEST_P(ComputeShaderTest, groupMemoryBarrierAndBarrierTest) TEST_P(ComputeShaderTest, groupMemoryBarrierAndBarrierTest)
{ {
// Crashes on Windows 32-bit SwiftShader Subzero. http://anglebug.com/4482
#if defined(ANGLE_IS_32_BIT_CPU)
ANGLE_SKIP_TEST_IF(isSwiftshader() && IsWindows());
#endif
// TODO(xinghua.cao@intel.com): Figure out why we get this error message // TODO(xinghua.cao@intel.com): Figure out why we get this error message
// that shader uses features not recognized by this D3D version. // that shader uses features not recognized by this D3D version.
ANGLE_SKIP_TEST_IF((IsAMD() || IsNVIDIA()) && IsD3D11()); ANGLE_SKIP_TEST_IF((IsAMD() || IsNVIDIA()) && IsD3D11());
...@@ -1887,11 +1882,6 @@ void main() ...@@ -1887,11 +1882,6 @@ void main()
// Verify shared non-array variables can work correctly. // Verify shared non-array variables can work correctly.
TEST_P(ComputeShaderTest, NonArraySharedVariable) TEST_P(ComputeShaderTest, NonArraySharedVariable)
{ {
// Crashes on Windows 32-bit SwiftShader Subzero. http://anglebug.com/4482
#if defined(ANGLE_IS_32_BIT_CPU)
ANGLE_SKIP_TEST_IF(isSwiftshader() && IsWindows());
#endif
const char kCSShader[] = R"(#version 310 es const char kCSShader[] = R"(#version 310 es
layout (local_size_x = 2, local_size_y = 2, local_size_z = 1) in; layout (local_size_x = 2, local_size_y = 2, local_size_z = 1) in;
layout (r32ui, binding = 0) readonly uniform highp uimage2D srcImage; layout (r32ui, binding = 0) readonly uniform highp uimage2D srcImage;
...@@ -1925,11 +1915,6 @@ void main() ...@@ -1925,11 +1915,6 @@ void main()
// Verify shared non-struct array variables can work correctly. // Verify shared non-struct array variables can work correctly.
TEST_P(ComputeShaderTest, NonStructArrayAsSharedVariable) TEST_P(ComputeShaderTest, NonStructArrayAsSharedVariable)
{ {
// Crashes on Windows 32-bit SwiftShader Subzero. http://anglebug.com/4482
#if defined(ANGLE_IS_32_BIT_CPU)
ANGLE_SKIP_TEST_IF(isSwiftshader() && IsWindows());
#endif
const char kCSShader[] = R"(#version 310 es const char kCSShader[] = R"(#version 310 es
layout (local_size_x = 2, local_size_y = 2, local_size_z = 1) in; layout (local_size_x = 2, local_size_y = 2, local_size_z = 1) in;
layout (r32ui, binding = 0) readonly uniform highp uimage2D srcImage; layout (r32ui, binding = 0) readonly uniform highp uimage2D srcImage;
...@@ -1954,11 +1939,6 @@ void main() ...@@ -1954,11 +1939,6 @@ void main()
// Verify shared struct array variables work correctly. // Verify shared struct array variables work correctly.
TEST_P(ComputeShaderTest, StructArrayAsSharedVariable) TEST_P(ComputeShaderTest, StructArrayAsSharedVariable)
{ {
// Crashes on Windows 32-bit SwiftShader Subzero. http://anglebug.com/4482
#if defined(ANGLE_IS_32_BIT_CPU)
ANGLE_SKIP_TEST_IF(isSwiftshader() && IsWindows());
#endif
const char kCSShader[] = R"(#version 310 es const char kCSShader[] = R"(#version 310 es
layout (local_size_x = 2, local_size_y = 2, local_size_z = 1) in; layout (local_size_x = 2, local_size_y = 2, local_size_z = 1) in;
layout (r32ui, binding = 0) readonly uniform highp uimage2D srcImage; layout (r32ui, binding = 0) readonly uniform highp uimage2D srcImage;
...@@ -1987,11 +1967,6 @@ void main() ...@@ -1987,11 +1967,6 @@ void main()
// Verify using atomic functions without return value can work correctly. // Verify using atomic functions without return value can work correctly.
TEST_P(ComputeShaderTest, AtomicFunctionsNoReturnValue) TEST_P(ComputeShaderTest, AtomicFunctionsNoReturnValue)
{ {
// Crashes on Windows 32-bit SwiftShader Subzero. http://anglebug.com/4482
#if defined(ANGLE_IS_32_BIT_CPU)
ANGLE_SKIP_TEST_IF(isSwiftshader() && IsWindows());
#endif
// Fails on AMD windows drivers. http://anglebug.com/3872 // Fails on AMD windows drivers. http://anglebug.com/3872
ANGLE_SKIP_TEST_IF(IsWindows() && IsAMD() && IsVulkan()); ANGLE_SKIP_TEST_IF(IsWindows() && IsAMD() && IsVulkan());
...@@ -2058,11 +2033,6 @@ void main() ...@@ -2058,11 +2033,6 @@ void main()
// Verify using atomic functions in a non-initializer single assignment can work correctly. // Verify using atomic functions in a non-initializer single assignment can work correctly.
TEST_P(ComputeShaderTest, AtomicFunctionsInNonInitializerSingleAssignment) TEST_P(ComputeShaderTest, AtomicFunctionsInNonInitializerSingleAssignment)
{ {
// Crashes on Windows 32-bit SwiftShader Subzero. http://anglebug.com/4482
#if defined(ANGLE_IS_32_BIT_CPU)
ANGLE_SKIP_TEST_IF(isSwiftshader() && IsWindows());
#endif
// Fails on AMD windows drivers. http://anglebug.com/3872 // Fails on AMD windows drivers. http://anglebug.com/3872
ANGLE_SKIP_TEST_IF(IsWindows() && IsAMD() && IsVulkan()); ANGLE_SKIP_TEST_IF(IsWindows() && IsAMD() && IsVulkan());
...@@ -2112,11 +2082,6 @@ void main() ...@@ -2112,11 +2082,6 @@ void main()
// Verify using atomic functions in an initializers and using unsigned int works correctly. // Verify using atomic functions in an initializers and using unsigned int works correctly.
TEST_P(ComputeShaderTest, AtomicFunctionsInitializerWithUnsigned) TEST_P(ComputeShaderTest, AtomicFunctionsInitializerWithUnsigned)
{ {
// Crashes on Windows 32-bit SwiftShader Subzero. http://anglebug.com/4482
#if defined(ANGLE_IS_32_BIT_CPU)
ANGLE_SKIP_TEST_IF(isSwiftshader() && IsWindows());
#endif
// Fails on AMD windows drivers. http://anglebug.com/3872 // Fails on AMD windows drivers. http://anglebug.com/3872
ANGLE_SKIP_TEST_IF(IsWindows() && IsAMD() && IsVulkan()); ANGLE_SKIP_TEST_IF(IsWindows() && IsAMD() && IsVulkan());
...@@ -2177,11 +2142,6 @@ void main() ...@@ -2177,11 +2142,6 @@ void main()
// Verify using atomic functions inside expressions as unsigned int. // Verify using atomic functions inside expressions as unsigned int.
TEST_P(ComputeShaderTest, AtomicFunctionsReturnWithUnsigned) TEST_P(ComputeShaderTest, AtomicFunctionsReturnWithUnsigned)
{ {
// Crashes on Windows 32-bit SwiftShader Subzero. http://anglebug.com/4482
#if defined(ANGLE_IS_32_BIT_CPU)
ANGLE_SKIP_TEST_IF(isSwiftshader() && IsWindows());
#endif
// Fails on AMD windows drivers. http://anglebug.com/3872 // Fails on AMD windows drivers. http://anglebug.com/3872
ANGLE_SKIP_TEST_IF(IsWindows() && IsAMD() && IsVulkan()); ANGLE_SKIP_TEST_IF(IsWindows() && IsAMD() && IsVulkan());
...@@ -2232,11 +2192,6 @@ void main() ...@@ -2232,11 +2192,6 @@ void main()
// Verify using nested atomic functions in expressions. // Verify using nested atomic functions in expressions.
TEST_P(ComputeShaderTest, AtomicFunctionsReturnWithMultipleTypes) TEST_P(ComputeShaderTest, AtomicFunctionsReturnWithMultipleTypes)
{ {
// Crashes on Windows 32-bit SwiftShader Subzero. http://anglebug.com/4482
#if defined(ANGLE_IS_32_BIT_CPU)
ANGLE_SKIP_TEST_IF(isSwiftshader() && IsWindows());
#endif
constexpr char kCShader[] = R"(#version 310 es constexpr char kCShader[] = R"(#version 310 es
layout (local_size_x = 4, local_size_y = 1, local_size_z = 1) in; layout (local_size_x = 4, local_size_y = 1, local_size_z = 1) in;
layout (r32ui, binding = 0) readonly uniform highp uimage2D srcImage; layout (r32ui, binding = 0) readonly uniform highp uimage2D srcImage;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment