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/759122Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>

KHR_create_context with GLES forbids _KHR reset notification enum.
c5de4d29 · Jeff Gilbert · Commit Bot · 3fb0ca02 · c5de4d29 · c5de4d29
Commit c5de4d29 authored Oct 31, 2017 by Jeff Gilbert Committed by Commit Bot Nov 08, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

Context.cpp src/libANGLE/Context.cpp +1 -1

validationEGL.cpp src/libANGLE/validationEGL.cpp +3 -3

No files found.
--- a/src/libANGLE/Context.cpp
+++ b/src/libANGLE/Context.cpp
@@ -165,7 +165,7 @@ gl::Version GetClientVersion(const egl::AttributeMap &attribs)
 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:

--- a/src/libANGLE/validationEGL.cpp
+++ b/src/libANGLE/validationEGL.cpp
@@ -605,9 +605,9 @@ Error ValidateCreateContext(Display *display, Config *configuration, gl::Context
            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)
            {