Disable the 565 config requirement for X11

Previously to GLES3 CTS didn't require this config to be present.  On
an 8888 X11 system it doesn't make sense to expose 565 since there are
no 16-bit visuals to be rendered to.

Affects:

dEQP-GLES3.*

Components: OpenGL

VK-GL-CTS issue: 1474

Change-Id: I14fe98ea21a86c48f0d4d155ba51a916255ef3ba

diff --git a/external/openglcts/modules/runner/CMakeLists.txt b/external/openglcts/modules/runner/CMakeLists.txt
index 7ab5bb9..0acc033 100644 (file)
--- a/external/openglcts/modules/runner/CMakeLists.txt
+++ b/external/openglcts/modules/runner/CMakeLists.txt
@@ -3,6 +3,10 @@ set(GLCTS_RUNNER_SRCS
        glcTestRunner.hpp
        )
 
+if (DEQP_USE_X11)
+       add_definitions(-DDEQP_SUPPORT_X11=1)
+endif ()
+
 if (DE_OS_IS_ANDROID)
        include_directories(${PROJECT_SOURCE_DIR}/framework/platform/android)
 

diff --git a/external/openglcts/modules/runner/glcAospMustpassEs.hpp b/external/openglcts/modules/runner/glcAospMustpassEs.hpp
index 965ae47..470329b 100644 (file)
--- a/external/openglcts/modules/runner/glcAospMustpassEs.hpp
+++ b/external/openglcts/modules/runner/glcAospMustpassEs.hpp
@@ -37,7 +37,9 @@ static const RunParams aosp_mustpass_es_first_cfg[] = {
        { glu::ApiType::es(3, 0), "rotate-reverse-landscape", "rgba8888d24s8ms0", "270", -1, DE_NULL, 256, 256 },
 #endif // DE_OS == DE_OS_ANDROID
        { glu::ApiType::es(3, 0), "multisample", "rgba8888d24s8ms4", "unspecified", -1, DE_NULL, 256, 256 },
+#ifndef DDEQP_SUPPORT_X11
        { glu::ApiType::es(3, 0), "565-no-depth-no-stencil", "rgb565d0s0ms0", "unspecified", -1, DE_NULL, 256, 256 },
+#endif // DDEQP_SUPPORT_X11
        { glu::ApiType::es(3, 1), "master", "rgba8888d24s8ms0", "unspecified", -1, DE_NULL, 256, 256 },
 #if DE_OS == DE_OS_ANDROID
        { glu::ApiType::es(3, 1), "rotate-portrait", "rgba8888d24s8ms0", "0", -1, DE_NULL, 256, 256 },
@@ -52,7 +54,9 @@ static const RunParams aosp_mustpass_es_first_cfg[] = {
        { glu::ApiType::es(3, 1), "rotate-reverse-landscape", "rgba8888d24s8ms0", "270", -1, DE_NULL, 256, 256 },
 #endif // DE_OS == DE_OS_ANDROID
        { glu::ApiType::es(3, 1), "multisample", "rgba8888d24s8ms4", "unspecified", -1, DE_NULL, 256, 256 },
+#ifndef DDEQP_SUPPORT_X11
        { glu::ApiType::es(3, 1), "565-no-depth-no-stencil", "rgb565d0s0ms0", "unspecified", -1, DE_NULL, 256, 256 },
+#endif // DDEQP_SUPPORT_X11
 };
 
 #endif // _GLCAOSPMUSTPASSES_HPP

diff --git a/external/openglcts/scripts/build_mustpass.py b/external/openglcts/scripts/build_mustpass.py
index 73e538a..c7409ea 100644 (file)
--- a/external/openglcts/scripts/build_mustpass.py
+++ b/external/openglcts/scripts/build_mustpass.py
@@ -166,6 +166,7 @@ GLCTS_3_2_2_GLES3_PKG                                       = Package(module = ES3CTS_MODULE, configurations = [
                                        rotation                = "unspecified",
                                        surfacewidth    = "256",
                                        surfaceheight   = "256",
+                                       skip                    = "x11",
                                        filters                 = [include("gles3-master.txt"),
                                                                           include("gles3-pixelformat.txt"),
                                                                           exclude("gles3-pixelformat-issues.txt")]),
@@ -222,6 +223,7 @@ GLCTS_3_2_2_GLES31_PKG                                      = Package(module = ES31CTS_MODULE, configurations = [
                                        rotation                = "unspecified",
                                        surfacewidth    = "256",
                                        surfaceheight   = "256",
+                                       skip                    = "x11",
                                        filters                 = [include("gles31-master.txt"), include("gles31-pixelformat.txt")]),
        ])
 
@@ -317,6 +319,7 @@ GLCTS_3_2_3_GLES3_PKG                               = Package(module = ES3CTS_MODULE, configurations = [
                                        rotation        = "unspecified",
                                        surfacewidth    = "256",
                                        surfaceheight   = "256",
+                                       skip                    = "x11",
                                        filters         = GLCTS_3_2_3_GLES3_COMMON_FILTERS + [include("gles3-pixelformat.txt")]),
 
        ])
@@ -384,6 +387,7 @@ GLCTS_3_2_3_GLES31_PKG                              = Package(module = ES31CTS_MODULE, configurations = [
                                        rotation        = "unspecified",
                                        surfacewidth    = "256",
                                        surfaceheight   = "256",
+                                       skip                    = "x11",
                                        filters         = GLCTS_3_2_3_GLES31_COMMON_FILTERS + [include("gles31-pixelformat.txt")]),
        ])
 
@@ -519,6 +523,7 @@ MASTER_GLES3_PKG                            = Package(module = ES3CTS_MODULE, configurations = [
                                        rotation        = "unspecified",
                                        surfacewidth    = "256",
                                        surfaceheight   = "256",
+                                       skip                    = "x11",
                                        filters         = MASTER_GLES3_COMMON_FILTERS + [include("gles3-pixelformat.txt")]),
        ])
 MASTER_GLES31_COMMON_FILTERS             = [
@@ -580,6 +585,7 @@ MASTER_GLES31_PKG                           = Package(module = ES31CTS_MODULE, configurations = [
                                        rotation        = "unspecified",
                                        surfacewidth    = "256",
                                        surfaceheight   = "256",
+                                       skip                    = "x11",
                                        filters         = MASTER_GLES31_COMMON_FILTERS + [include("gles31-pixelformat.txt")]),
        ])
 
@@ -1194,5 +1200,4 @@ if __name__ == "__main__":
                raise Exception("GTF sources not found. GTF module is required to build the mustpass files. 'cd external && python fetch_kc_cts.py'")
        genMustpassLists(ES_MUSTPASS_LISTS, ANY_GENERATOR, ES_BUILD_CONFIG)
        gl_mustpass_lists = generateGLMustpass()
-#      genMustpassLists(gl_mustpass_lists, ANY_GENERATOR, GL_BUILD_CONFIG)
-
+       genMustpassLists(gl_mustpass_lists, ANY_GENERATOR, GL_BUILD_CONFIG)

diff --git a/external/openglcts/scripts/mustpass.py b/external/openglcts/scripts/mustpass.py
index 11cabf1..cbd2597 100644 (file)
--- a/external/openglcts/scripts/mustpass.py
+++ b/external/openglcts/scripts/mustpass.py
@@ -49,7 +49,7 @@ class Project:
                self.copyright  = copyright
 
 class Configuration:
-       def __init__ (self, name, filters, glconfig = None, rotation = "unspecified", surfacetype = None, surfacewidth = None, surfaceheight = None, baseseed = None, fboconfig = None, required = False, runtime = None, os = "any"):
+       def __init__ (self, name, filters, glconfig = None, rotation = "unspecified", surfacetype = None, surfacewidth = None, surfaceheight = None, baseseed = None, fboconfig = None, required = False, runtime = None, os = "any", skip = "none"):
                self.name                               = name
                self.glconfig                   = glconfig
                self.rotation                   = rotation
@@ -62,6 +62,7 @@ class Configuration:
                self.filters                    = filters
                self.expectedRuntime    = runtime
                self.os                                 = os
+               self.skipPlatform               = skip
 
 class Package:
        def __init__ (self, module, configurations, useforfirsteglconfig = True):
@@ -321,6 +322,8 @@ def genSpecCPPIncludeFile (specFilename, mustpass):
        gtf_wrapper_close = "#endif // defined(DEQP_GTF_AVAILABLE)\n"
        android_wrapper_open = "#if DE_OS == DE_OS_ANDROID\n"
        android_wrapper_close = "#endif // DE_OS == DE_OS_ANDROID\n"
+       skip_x11_wrapper_open = "#ifndef DDEQP_SUPPORT_X11\n"
+       skip_x11_wrapper_close = "#endif // DDEQP_SUPPORT_X11\n"
        TABLE_ELEM_PATTERN      = "{apiType} {configName} {glConfigName} {screenRotation} {baseSeed} {fboConfig} {surfaceWidth} {surfaceHeight}"
 
        emitOtherCfgTbl = False
@@ -349,8 +352,14 @@ def genSpecCPPIncludeFile (specFilename, mustpass):
                        if config.os == "android":
                                elemFinal += android_wrapper_open
 
+                       if config.skipPlatform == "x11":
+                               elemFinal += skip_x11_wrapper_open
+
                        elemFinal += elem
 
+                       if config.skipPlatform == "x11":
+                               elemFinal += skip_x11_wrapper_close
+
                        if config.os == "android":
                                elemFinal += android_wrapper_close