Correct usage of the DEQP_SUPPORT_X11 macro with the cts-runner

Components: OpenGL

VK-GL-CTS issue: 1601

Affects:

dEQP-GLES3.*

Change-Id: I106b6487558642f55b5900413d0fc2c60882a7e1

diff --git a/external/openglcts/modules/runner/glcAospMustpassEs.hpp b/external/openglcts/modules/runner/glcAospMustpassEs.hpp
index 470329b..2a00fe9 100644 (file)
--- a/external/openglcts/modules/runner/glcAospMustpassEs.hpp
+++ b/external/openglcts/modules/runner/glcAospMustpassEs.hpp
@@ -37,9 +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
+#ifndef DEQP_SUPPORT_X11
        { glu::ApiType::es(3, 0), "565-no-depth-no-stencil", "rgb565d0s0ms0", "unspecified", -1, DE_NULL, 256, 256 },
-#endif // DDEQP_SUPPORT_X11
+#endif // DEQP_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 },
@@ -54,9 +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
+#ifndef DEQP_SUPPORT_X11
        { glu::ApiType::es(3, 1), "565-no-depth-no-stencil", "rgb565d0s0ms0", "unspecified", -1, DE_NULL, 256, 256 },
-#endif // DDEQP_SUPPORT_X11
+#endif // DEQP_SUPPORT_X11
 };
 
 #endif // _GLCAOSPMUSTPASSES_HPP

diff --git a/external/openglcts/scripts/mustpass.py b/external/openglcts/scripts/mustpass.py
index cbd2597..08d16c5 100644 (file)
--- a/external/openglcts/scripts/mustpass.py
+++ b/external/openglcts/scripts/mustpass.py
@@ -322,8 +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"
+       skip_x11_wrapper_open = "#ifndef DEQP_SUPPORT_X11\n"
+       skip_x11_wrapper_close = "#endif // DEQP_SUPPORT_X11\n"
        TABLE_ELEM_PATTERN      = "{apiType} {configName} {glConfigName} {screenRotation} {baseSeed} {fboConfig} {surfaceWidth} {surfaceHeight}"
 
        emitOtherCfgTbl = False