Fix ContextLostTest if robustness ext is disabled

Reset notification behavior is defined in the GL_EXT_robustness extension, and the resulting context must support the extension and the specified reset strategy. So if the ext is not supported, it should disable delivery of reset notifications. Bug: angleproject:4823 Change-Id: I49b9364a83eab9ebc0fdca3b1dc075c1a43070cf Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2302874 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>

Fix ContextLostTest if robustness ext is disabled
9b9472c3 · Xinyi He · Commit Bot · 94303d17 · 9b9472c3
Commit 9b9472c3 authored Jul 17, 2020 by Xinyi He Committed by Commit Bot Jul 17, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 22 additions and 4 deletions

ContextLostTest.cpp src/tests/gl_tests/ContextLostTest.cpp +22 -4

No files found.
--- a/src/tests/gl_tests/ContextLostTest.cpp
+++ b/src/tests/gl_tests/ContextLostTest.cpp
@@ -13,7 +13,17 @@ namespace angle
 class ContextLostTest : public ANGLETest
 {
  protected:
-    ContextLostTest() { setContextResetStrategy(EGL_LOSE_CONTEXT_ON_RESET_EXT); }
+    ContextLostTest()
+    {
+        if (IsEGLClientExtensionEnabled("EGL_EXT_create_context_robustness"))
+        {
+            setContextResetStrategy(EGL_LOSE_CONTEXT_ON_RESET_EXT);
+        }
+        else
+        {
+            setContextResetStrategy(EGL_NO_RESET_NOTIFICATION_EXT);
+        }
+    }
 };

 // GL_CHROMIUM_lose_context is implemented in the frontend
@@ -26,7 +36,8 @@ TEST_P(ContextLostTest, ExtensionStringExposed)
 TEST_P(ContextLostTest, BasicUsage)
 {
    ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_CHROMIUM_lose_context"));
-    ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_EXT_robustness"));
+    ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_EXT_robustness") ||
+                       !IsEGLClientExtensionEnabled("EGL_EXT_create_context_robustness"));

    glLoseContextCHROMIUM(GL_GUILTY_CONTEXT_RESET, GL_INNOCENT_CONTEXT_RESET);
    EXPECT_GL_NO_ERROR();
@@ -108,8 +119,15 @@ class ContextLostSkipValidationTest : public ANGLETest
  protected:
    ContextLostSkipValidationTest()
    {
-        setContextResetStrategy(EGL_LOSE_CONTEXT_ON_RESET_EXT);
-        setNoErrorEnabled(true);
+        if (IsEGLClientExtensionEnabled("EGL_EXT_create_context_robustness"))
+        {
+            setContextResetStrategy(EGL_LOSE_CONTEXT_ON_RESET_EXT);
+            setNoErrorEnabled(true);
+        }
+        else
+        {
+            setContextResetStrategy(EGL_NO_RESET_NOTIFICATION_EXT);
+        }
    }
 };