Wrap gtf-master lists with defines

Components: OpenGL
Affects: GLES conformance submission runs

Change-Id: I5bf125ea1d4e286ff198418572783ff120c20de8

diff --git a/external/openglcts/modules/runner/glcKhronosMustpassEs.hpp b/external/openglcts/modules/runner/glcKhronosMustpassEs.hpp
index 442ddc6..349b156 100644 (file)
--- a/external/openglcts/modules/runner/glcKhronosMustpassEs.hpp
+++ b/external/openglcts/modules/runner/glcKhronosMustpassEs.hpp
@@ -35,22 +35,50 @@ struct RunParams
 
 static const RunParams khronos_mustpass_es_first_cfg[] = {
        { glu::ApiType::es(2, 0), "khr-master", DE_NULL, "unspecified", 1, DE_NULL, 64, 64 },
+#if defined(DEQP_GTF_AVAILABLE)
        { glu::ApiType::es(2, 0), "gtf-master", DE_NULL, "unspecified", 1, DE_NULL, 64, 64 },
+#endif // defined(DEQP_GTF_AVAILABLE)
+#if defined(DEQP_GTF_AVAILABLE)
        { glu::ApiType::es(2, 0), "gtf-master", DE_NULL, "unspecified", 2, DE_NULL, 113, 47 },
+#endif // defined(DEQP_GTF_AVAILABLE)
+#if defined(DEQP_GTF_AVAILABLE)
        { glu::ApiType::es(2, 0), "gtf-master", DE_NULL, "unspecified", 3, "rgba8888d24s8", 64, -1 },
+#endif // defined(DEQP_GTF_AVAILABLE)
+#if defined(DEQP_GTF_AVAILABLE)
        { glu::ApiType::es(2, 0), "gtf-master", DE_NULL, "unspecified", 3, "rgba8888d24s8", -1, 64 },
+#endif // defined(DEQP_GTF_AVAILABLE)
+#if defined(DEQP_GTF_AVAILABLE)
        { glu::ApiType::es(2, 0), "gtf-egl", DE_NULL, "unspecified", 1, DE_NULL, 64, 64 },
+#endif // defined(DEQP_GTF_AVAILABLE)
+#if defined(DEQP_GTF_AVAILABLE)
        { glu::ApiType::es(2, 0), "gtf-egl", DE_NULL, "unspecified", 2, DE_NULL, 113, 47 },
+#endif // defined(DEQP_GTF_AVAILABLE)
        { glu::ApiType::es(3, 0), "khr-master", DE_NULL, "unspecified", 1, DE_NULL, 64, 64 },
+#if defined(DEQP_GTF_AVAILABLE)
        { glu::ApiType::es(3, 0), "gtf-master", DE_NULL, "unspecified", 1, DE_NULL, 64, 64 },
+#endif // defined(DEQP_GTF_AVAILABLE)
+#if defined(DEQP_GTF_AVAILABLE)
        { glu::ApiType::es(3, 0), "gtf-master", DE_NULL, "unspecified", 2, DE_NULL, 113, 47 },
+#endif // defined(DEQP_GTF_AVAILABLE)
+#if defined(DEQP_GTF_AVAILABLE)
        { glu::ApiType::es(3, 0), "gtf-master", DE_NULL, "unspecified", 3, "rgba8888d24s8", 64, -1 },
+#endif // defined(DEQP_GTF_AVAILABLE)
+#if defined(DEQP_GTF_AVAILABLE)
        { glu::ApiType::es(3, 0), "gtf-master", DE_NULL, "unspecified", 3, "rgba8888d24s8", -1, 64 },
+#endif // defined(DEQP_GTF_AVAILABLE)
        { glu::ApiType::es(3, 1), "khr-master", DE_NULL, "unspecified", 1, DE_NULL, 64, 64 },
+#if defined(DEQP_GTF_AVAILABLE)
        { glu::ApiType::es(3, 1), "gtf-master", DE_NULL, "unspecified", 1, DE_NULL, 64, 64 },
+#endif // defined(DEQP_GTF_AVAILABLE)
+#if defined(DEQP_GTF_AVAILABLE)
        { glu::ApiType::es(3, 1), "gtf-master", DE_NULL, "unspecified", 2, DE_NULL, 113, 47 },
+#endif // defined(DEQP_GTF_AVAILABLE)
+#if defined(DEQP_GTF_AVAILABLE)
        { glu::ApiType::es(3, 1), "gtf-master", DE_NULL, "unspecified", 3, "rgba8888d24s8", 64, -1 },
+#endif // defined(DEQP_GTF_AVAILABLE)
+#if defined(DEQP_GTF_AVAILABLE)
        { glu::ApiType::es(3, 1), "gtf-master", DE_NULL, "unspecified", 3, "rgba8888d24s8", -1, 64 },
+#endif // defined(DEQP_GTF_AVAILABLE)
        { glu::ApiType::es(3, 2), "khr-master", DE_NULL, "unspecified", 1, DE_NULL, 64, 64 },
        { glu::ApiType::es(3, 2), "khr-master", DE_NULL, "unspecified", 2, DE_NULL, 113, 47 },
        { glu::ApiType::es(3, 2), "khr-master", DE_NULL, "unspecified", 3, "rgba8888d24s8", 64, -1 },
@@ -59,14 +87,26 @@ static const RunParams khronos_mustpass_es_first_cfg[] = {
 
 static const RunParams khronos_mustpass_es_other_cfg[] = {
        { glu::ApiType::es(2, 0), "khr-master", DE_NULL, "unspecified", 1, DE_NULL, 64, 64 },
+#if defined(DEQP_GTF_AVAILABLE)
        { glu::ApiType::es(2, 0), "gtf-master", DE_NULL, "unspecified", 1, DE_NULL, 64, 64 },
+#endif // defined(DEQP_GTF_AVAILABLE)
+#if defined(DEQP_GTF_AVAILABLE)
        { glu::ApiType::es(2, 0), "gtf-master", DE_NULL, "unspecified", 2, DE_NULL, 113, 47 },
+#endif // defined(DEQP_GTF_AVAILABLE)
        { glu::ApiType::es(3, 0), "khr-master", DE_NULL, "unspecified", 1, DE_NULL, 64, 64 },
+#if defined(DEQP_GTF_AVAILABLE)
        { glu::ApiType::es(3, 0), "gtf-master", DE_NULL, "unspecified", 1, DE_NULL, 64, 64 },
+#endif // defined(DEQP_GTF_AVAILABLE)
+#if defined(DEQP_GTF_AVAILABLE)
        { glu::ApiType::es(3, 0), "gtf-master", DE_NULL, "unspecified", 2, DE_NULL, 113, 47 },
+#endif // defined(DEQP_GTF_AVAILABLE)
        { glu::ApiType::es(3, 1), "khr-master", DE_NULL, "unspecified", 1, DE_NULL, 64, 64 },
+#if defined(DEQP_GTF_AVAILABLE)
        { glu::ApiType::es(3, 1), "gtf-master", DE_NULL, "unspecified", 1, DE_NULL, 64, 64 },
+#endif // defined(DEQP_GTF_AVAILABLE)
+#if defined(DEQP_GTF_AVAILABLE)
        { glu::ApiType::es(3, 1), "gtf-master", DE_NULL, "unspecified", 2, DE_NULL, 113, 47 },
+#endif // defined(DEQP_GTF_AVAILABLE)
        { glu::ApiType::es(3, 2), "khr-master", DE_NULL, "unspecified", 1, DE_NULL, 64, 64 },
        { glu::ApiType::es(3, 2), "khr-master", DE_NULL, "unspecified", 2, DE_NULL, 113, 47 },
 };

diff --git a/external/openglcts/scripts/mustpass.py b/external/openglcts/scripts/mustpass.py
index 7b1b676..422ebe3 100644 (file)
--- a/external/openglcts/scripts/mustpass.py
+++ b/external/openglcts/scripts/mustpass.py
@@ -307,8 +307,8 @@ def genSpecCPPIncludeFile (specFilename, mustpass):
        fileBody += "};\n"
        fileBody += "\n"
 
-       gtf_wrapper_open = "#if defined (DEQP_GTF_AVAILABLE)\n"
-       gtf_wrapper_close = "#endif // defined (DEQP_GTF_AVAILABLE)\n"
+       gtf_wrapper_open = "#if defined(DEQP_GTF_AVAILABLE)\n"
+       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"
        TABLE_ELEM_PATTERN      = "{apiType} {configName} {glConfigName} {screenRotation} {baseSeed} {fboConfig} {surfaceWidth} {surfaceHeight}"
@@ -333,7 +333,7 @@ def genSpecCPPIncludeFile (specFilename, mustpass):
                        elemFinal = ""
                        elemContent = TABLE_ELEM_PATTERN.format(apiType = pApiType, configName = pConfigName, glConfigName = pGLConfig, screenRotation = pRotation, baseSeed = pSeed, fboConfig = pFBOConfig, surfaceWidth = pWidth, surfaceHeight = pHeight)
                        elem = "\t{ " + elemContent + " },\n"
-                       if package.module.name[-3:] == "GTF":
+                       if package.module.name[:3] == "GTF":
                                elemFinal += gtf_wrapper_open
 
                        if config.os == "android":
@@ -344,7 +344,7 @@ def genSpecCPPIncludeFile (specFilename, mustpass):
                        if config.os == "android":
                                elemFinal += android_wrapper_close
 
-                       if package.module.name[-3:] == "GTF":
+                       if package.module.name[:3] == "GTF":
                                elemFinal += gtf_wrapper_close
 
                        if package.useforfirsteglconfig == True: