Infrastructure to remove EGL/GLES31 tests from mustpass

Components: OpenGL
Affects: 3.2.3.x mustpass generation

Change-Id: I8ffa72d198d351bcde67ca2293779dd93db5d5a0

diff --git a/external/openglcts/data/mustpass/egl/aosp_mustpass/3.2.3.x/src/egl-driver-issues.txt b/external/openglcts/data/mustpass/egl/aosp_mustpass/3.2.3.x/src/egl-driver-issues.txt
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.3.x/src/gles31-driver-issues.txt b/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.3.x/src/gles31-driver-issues.txt
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/external/openglcts/scripts/build_mustpass.py b/external/openglcts/scripts/build_mustpass.py
index ef74334..f4c1040 100644 (file)
--- a/external/openglcts/scripts/build_mustpass.py
+++ b/external/openglcts/scripts/build_mustpass.py
@@ -205,6 +205,21 @@ GLCTS_3_2_2_GLES31_PKG                                     = Package(module = ES31CTS_MODULE, configurations = [
        ])
 
 # 3.2.3.x
+GLCTS_3_2_3_EGL_COMMON_FILTERS                 = [include("egl-master.txt"),
+               exclude("egl-test-issues.txt"),
+               exclude("egl-internal-api-tests.txt"),
+               exclude("egl-driver-issues.txt")
+       ]
+GLCTS_3_2_3_EGL_PKG                                            = Package(module = EGL_MODULE, configurations = [
+               # Master
+               Configuration(name                      = "master",
+                                       glconfig                = "rgba8888d24s8ms0",
+                                       rotation                = "unspecified",
+                                       surfacewidth    = "256",
+                    surfaceheight   = "256",
+                                       filters                 = GLCTS_3_2_3_EGL_COMMON_FILTERS),
+       ])
+
 GLCTS_3_2_3_GLES2_COMMON_FILTERS       = [
                                include("gles2-master.txt"),
                                exclude("gles2-test-issues.txt"),
@@ -282,6 +297,69 @@ GLCTS_3_2_3_GLES3_PKG                              = Package(module = ES3CTS_MODULE, configurations = [
 
        ])
 
+GLCTS_3_2_3_GLES31_COMMON_FILTERS      = [
+               include("gles31-master.txt"),
+               exclude("gles31-test-issues.txt"),
+               exclude("gles31-spec-issues.txt"),
+               exclude("gles31-driver-issues.txt")
+       ]
+
+GLCTS_3_2_3_GLES31_PKG                         = Package(module = ES31CTS_MODULE, configurations = [
+               # Master
+               Configuration(name                      = "master",
+                                       glconfig        = "rgba8888d24s8ms0",
+                                       rotation        = "unspecified",
+                                       surfacewidth    = "256",
+                                       surfaceheight   = "256",
+                                       filters         = GLCTS_3_2_3_GLES31_COMMON_FILTERS),
+
+               # Rotations
+               Configuration(name                      = "rotate-portrait",
+                                       glconfig        = "rgba8888d24s8ms0",
+                                       rotation        = "0",
+                                       surfacewidth    = "256",
+                                       surfaceheight   = "256",
+                                       os                              = "android",
+                                       filters         = GLCTS_3_2_3_GLES31_COMMON_FILTERS + [include("gles31-rotation.txt")]),
+               Configuration(name                      = "rotate-landscape",
+                                       glconfig        = "rgba8888d24s8ms0",
+                                       rotation        = "90",
+                                       surfacewidth    = "256",
+                                       surfaceheight   = "256",
+                                       os                              = "android",
+                                       filters         = GLCTS_3_2_3_GLES31_COMMON_FILTERS + [include("gles31-rotation.txt")]),
+               Configuration(name                      = "rotate-reverse-portrait",
+                                       glconfig        = "rgba8888d24s8ms0",
+                                       rotation        = "180",
+                                       surfacewidth    = "256",
+                                       surfaceheight   = "256",
+                                       os                              = "android",
+                                       filters         = GLCTS_3_2_3_GLES31_COMMON_FILTERS + [include("gles31-rotation.txt")]),
+               Configuration(name                      = "rotate-reverse-landscape",
+                                       glconfig        = "rgba8888d24s8ms0",
+                                       rotation        = "270",
+                                       surfacewidth    = "256",
+                                       surfaceheight   = "256",
+                                       os                              = "android",
+                                       filters         = GLCTS_3_2_3_GLES31_COMMON_FILTERS + [include("gles31-rotation.txt")]),
+
+               # MSAA
+               Configuration(name                      = "multisample",
+                                       glconfig        = "rgba8888d24s8ms4",
+                                       rotation        = "unspecified",
+                                       surfacewidth    = "256",
+                                       surfaceheight   = "256",
+                                       filters         = GLCTS_3_2_3_GLES31_COMMON_FILTERS + [include("gles31-multisample.txt")]),
+
+               # Pixel format
+               Configuration(name                      = "565-no-depth-no-stencil",
+                                       glconfig        = "rgb565d0s0ms0",
+                                       rotation        = "unspecified",
+                                       surfacewidth    = "256",
+                                       surfaceheight   = "256",
+                                       filters         = GLCTS_3_2_3_GLES31_COMMON_FILTERS + [include("gles31-pixelformat.txt")]),
+       ])
+
 # master
 MASTER_EGL_COMMON_FILTERS                      = [include("egl-master.txt"),
                                                                                exclude("egl-test-issues.txt"),
@@ -755,10 +833,10 @@ MUSTPASS_LISTS                            = [
                                                ]),
 
        Mustpass(project = CTS_AOSP_MP_ES_PROJECT, version = "3.2.3.x", isCurrent=True,
-                       packages = [GLCTS_3_2_3_GLES2_PKG, GLCTS_3_2_3_GLES3_PKG, MASTER_GLES31_PKG]),
+                       packages = [GLCTS_3_2_3_GLES2_PKG, GLCTS_3_2_3_GLES3_PKG, GLCTS_3_2_3_GLES31_PKG]),
 
        Mustpass(project = CTS_AOSP_MP_EGL_PROJECT, version = "3.2.3.x", isCurrent=True,
-                       packages = [MASTER_EGL_PKG]),
+                       packages = [GLCTS_3_2_3_EGL_PKG]),
        # master
 
        Mustpass(project = CTS_KHR_MP_ES_PROJECT,       version = "master", isCurrent=False,