commit c5de4d29ce16699ad8befdf9d6da12e113806d2d
author Jeff Gilbert <jgilbert@mozilla.com> Tue Oct 31 15:07:53 2017 -0700
committer Commit Bot <commit-bot@chromium.org> Wed Nov 08 22:55:17 2017 +0000
tree bb7ba85697bbe398357a9415c9700697c1c10809
parent 3fb0ca02af4b7eb93b5cfc5b04f49fde6664a1d8

KHR_create_context with GLES forbids _KHR reset notification enum.

EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_EXT from
EXT_create_context_robustness must be used with GLES instead.

BUG=angleproject:2213

Change-Id: Icaf3c7550c4eb7cb61c6d4ed37adba7824ca4bc8
Reviewed-on: https://chromium-review.googlesource.com/759122
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

src/libANGLE/Context.cpp

diff --git a/src/libANGLE/Context.cpp b/src/libANGLE/Context.cpp
index eef8564..07bbb5a 100644
--- a/src/libANGLE/Context.cpp
+++ b/src/libANGLE/Context.cpp
@@ -165,7 +165,7 @@
 GLenum GetResetStrategy(const egl::AttributeMap &attribs)
 {
     EGLAttrib attrib = attribs.get(EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_EXT,
-                                   EGL_NO_RESET_NOTIFICATION_EXT);
+                                   EGL_NO_RESET_NOTIFICATION);
     switch (attrib)
     {
         case EGL_NO_RESET_NOTIFICATION:

src/libANGLE/validationEGL.cpp

diff --git a/src/libANGLE/validationEGL.cpp b/src/libANGLE/validationEGL.cpp
index 96a0a82..13a3a9e 100644
--- a/src/libANGLE/validationEGL.cpp
+++ b/src/libANGLE/validationEGL.cpp
@@ -605,9 +605,9 @@
             break;
 
           case EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_KHR:
-            static_assert(EGL_LOSE_CONTEXT_ON_RESET_EXT == EGL_LOSE_CONTEXT_ON_RESET_KHR, "EGL extension enums not equal.");
-            static_assert(EGL_NO_RESET_NOTIFICATION_EXT == EGL_NO_RESET_NOTIFICATION_KHR, "EGL extension enums not equal.");
-            // same as EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_EXT, fall through
+            return EglBadAttribute() << "EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_KHR is not"
+                                     << " valid for GLES with EGL 1.4 and KHR_create_context. Use"
+                                     << " EXT_create_context_robustness.";
           case EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_EXT:
             if (!display->getExtensions().createContextRobustness)
             {