Backed out changeset a7dc86b21aa5 (bug 1364169) for Windows mochitest-gl failures a=backout
authorWes Kocher <wkocher@mozilla.com>
Thu, 11 May 2017 15:40:31 -0700
changeset 357849 cb8a328af904
parent 357848 6ab9ba92e6a4
child 357850 3b3067e901d4
push id90227
push userkwierso@gmail.com
push dateThu, 11 May 2017 22:40:36 +0000
treeherdermozilla-inbound@cb8a328af904 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1364169
milestone55.0a1
backs outa7dc86b21aa5
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset a7dc86b21aa5 (bug 1364169) for Windows mochitest-gl failures a=backout MozReview-Commit-ID: LqRNHsMHfXv
gfx/angle/src/libANGLE/Context.cpp
--- a/gfx/angle/src/libANGLE/Context.cpp
+++ b/gfx/angle/src/libANGLE/Context.cpp
@@ -152,26 +152,18 @@ EGLint GetClientMinorVersion(const egl::
 
 gl::Version GetClientVersion(const egl::AttributeMap &attribs)
 {
     return gl::Version(GetClientMajorVersion(attribs), GetClientMinorVersion(attribs));
 }
 
 GLenum GetResetStrategy(const egl::AttributeMap &attribs)
 {
-    EGLAttrib attrib = attribs.get(EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_KHR, 0);
-    if (!attrib)
-    {
-        attrib = attribs.get(EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_EXT, 0);
-    }
-    if (!attrib)
-    {
-        attrib = EGL_NO_RESET_NOTIFICATION;
-    }
-
+    EGLAttrib attrib = attribs.get(EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_EXT,
+                                   EGL_NO_RESET_NOTIFICATION_EXT);
     switch (attrib)
     {
         case EGL_NO_RESET_NOTIFICATION:
             return GL_NO_RESET_NOTIFICATION_EXT;
         case EGL_LOSE_CONTEXT_ON_RESET:
             return GL_LOSE_CONTEXT_ON_RESET_EXT;
         default:
             UNREACHABLE();