GeometryTest: Expand suppressions to AMD Intel OpenGL

TBR=syoussefi@chromium.org
Bug: angleproject:5463
Change-Id: I3bdd17b5f9fd413e8fcbe734c6cb6f2110364e30
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2590185
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
diff --git a/src/tests/gl_tests/GeometryShaderTest.cpp b/src/tests/gl_tests/GeometryShaderTest.cpp
index 7064fca..ebb4a80 100644
--- a/src/tests/gl_tests/GeometryShaderTest.cpp
+++ b/src/tests/gl_tests/GeometryShaderTest.cpp
@@ -1161,7 +1161,7 @@
 {
     // Mesa considers the framebuffer with mixed 3D and 2D array attachments to be incomplete.
     // http://anglebug.com/5463
-    ANGLE_SKIP_TEST_IF(IsIntel() && IsOpenGL() && IsLinux());
+    ANGLE_SKIP_TEST_IF((IsAMD() || IsIntel()) && IsOpenGL() && IsLinux());
 
     layeredFramebufferClearTest(GL_TEXTURE_3D);
 }
@@ -1235,7 +1235,7 @@
 {
     // Mesa considers the framebuffer with mixed 3D and 2D array attachments to be incomplete.
     // http://anglebug.com/5463
-    ANGLE_SKIP_TEST_IF(IsIntel() && IsOpenGL() && IsLinux());
+    ANGLE_SKIP_TEST_IF((IsAMD() || IsIntel()) && IsOpenGL() && IsLinux());
 
     layeredFramebufferPreRenderClearTest(GL_TEXTURE_3D);
 }
@@ -1317,7 +1317,7 @@
 {
     // Mesa considers the framebuffer with mixed 3D and 2D array attachments to be incomplete.
     // http://anglebug.com/5463
-    ANGLE_SKIP_TEST_IF(IsIntel() && IsOpenGL() && IsLinux());
+    ANGLE_SKIP_TEST_IF((IsAMD() || IsIntel()) && IsOpenGL() && IsLinux());
 
     layeredFramebufferMidRenderClearTest(GL_TEXTURE_3D);
 }