Report NotSupported for GLES1 tests on non-ES1 run

If conformance build does not enable DEQP_SUPPORT_GLES1 while building
binary for non-ES1.1 conformance run then OpenGL ES 1.1 specific tests
should return NotSupported error instead of InternalError.

The reason is because the specification does not enforce ES 1.1 support
if conformance is run for non ES1 version like for ES 3.x version.

Components: OpenGL ES

VK-GL-CTS issue: 1343

Change-Id: Id7218cc011b3ee139237130a7cb7d850b4431d50
(cherry picked from commit 4eb9918b81069484603f3226ce090e303ef27eb5)

diff --git a/modules/egl/teglRenderCase.cpp b/modules/egl/teglRenderCase.cpp
index d86af65..7a89140 100644 (file)
--- a/modules/egl/teglRenderCase.cpp
+++ b/modules/egl/teglRenderCase.cpp
@@ -105,6 +105,11 @@ static void checkBuildClientAPISupport (EGLint requiredAPIs)
 {
        const EGLint    builtClientAPIs         = getBuildClientAPIMask();
 
+#if !defined(DEQP_SUPPORT_GLES1)
+    if (requiredAPIs & EGL_OPENGL_ES_BIT)
+        TCU_THROW(NotSupportedError, "Test case requires ES1.1 API not supported in current build");
+    else
+#endif
        if ((requiredAPIs & builtClientAPIs) != requiredAPIs)
                TCU_THROW(InternalError, "Test case requires client API not supported in current build");
 }