CreateGeometryShaderInES3: Skip on ES3.1+

When testing the system EGL (angle_test_enable_system_egl = true), the
context returned is the maximally conformant version, which can be
OpenGL ES 3.2. The test GeometryShaderTestES3.CreateGeometryShaderInES3
verifies that geometry shaders cannot be created, assuming it will only
ever be testing ES 3.0 contexts.

1. Add ANGLE_INSTANTIATE_TEST_ES3_AND_ES31_AND_ES32() to instantiate a
   test for ES 3.0, 3.1, and 3.2.
2. Update GeometryShaderTestES3.CreateGeometryShaderInES3 to skip when
   testing ES 3.1+ contexts.
3. Instantiate GeometryShaderTestES3 for ES 3.0, 3.1, and 3.2.

Bug: b/409384875
Test: GeometryShaderTestES3
Change-Id: Ic5b4dbb167b8de7f24da285b4620f5257ed7df54
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/6794766
Reviewed-by: Amirali Abdolrashidi <[email protected]>
Commit-Queue: Tim Van Patten <[email protected]>
Reviewed-by: Shahbaz Youssefi <[email protected]>

Author: timvpGoogle

src/tests/gl_tests/GeometryShaderTest.cpp

@@ -108,7 +108,11 @@ class GeometryShaderTestES32 : public GeometryShaderTest
 // ES 3.1 is required.
 TEST_P(GeometryShaderTestES3, CreateGeometryShaderInES3)
 {
-    EXPECT_TRUE(!IsGLExtensionEnabled("GL_EXT_geometry_shader"));
+    // Only run the test against OpenGL ES 3.0.
+    ANGLE_SKIP_TEST_IF(getClientMajorVersion() == 3 && getClientMinorVersion() > 0);
+    // GL_EXT_geometry_shader requires OpenGL ES 3.1.
+    ASSERT_FALSE(IsGLExtensionEnabled("GL_EXT_geometry_shader"));
+
     GLuint geometryShader = glCreateShader(GL_GEOMETRY_SHADER_EXT);
     EXPECT_EQ(0u, geometryShader);
     EXPECT_GL_ERROR(GL_INVALID_ENUM);
@@ -2066,7 +2070,7 @@ void main()
 }
 
 GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(GeometryShaderTestES3);
-ANGLE_INSTANTIATE_TEST_ES3(GeometryShaderTestES3);
+ANGLE_INSTANTIATE_TEST_ES3_AND_ES31_AND_ES32(GeometryShaderTestES3);
 
 GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(GeometryShaderTest);
 ANGLE_INSTANTIATE_TEST_ES31_AND(GeometryShaderTest,

src/tests/test_utils/angle_test_instantiate.h

@@ -271,6 +271,13 @@ struct CombinedPrintToStringParamName
     INSTANTIATE_TEST_SUITE_P(, testName, ANGLE_INSTANTIATE_TEST_PLATFORMS(testName),            \
                              testing::PrintToStringParamName())
 
+#define ANGLE_INSTANTIATE_TEST_ES3_AND_ES31_AND_ES32(testName, ...)                             \
+    const PlatformParameters testName##params[] = {ANGLE_ALL_TEST_PLATFORMS_ES3,                \
+                                                   ANGLE_ALL_TEST_PLATFORMS_ES31,               \
+                                                   ANGLE_ALL_TEST_PLATFORMS_ES32, __VA_ARGS__}; \
+    INSTANTIATE_TEST_SUITE_P(, testName, ANGLE_INSTANTIATE_TEST_PLATFORMS(testName),            \
+                             testing::PrintToStringParamName())
+
 // Instantiate the test for a combination of N parameters and the
 // enumeration of platforms in the extra args, similar to
 // ANGLE_INSTANTIATE_TEST.  The macros are defined only for the Ns