☠☠ backed out by daf0c22a7f03 ☠ ☠ | |
author | Samuel Vargas <svargas@mozilla.com> |
Mon, 15 May 2017 15:01:57 -0700 | |
changeset 360487 | 70768edfd5620271b2451059b8df8eac377f55b6 |
parent 360486 | 2e881529b6df9f2c8dab47e2545a5005571539bd |
child 360488 | daf0c22a7f03582e9a47928fd46f058f59d66b99 |
push id | 90680 |
push user | jgilbert@mozilla.com |
push date | Wed, 24 May 2017 22:58:14 +0000 |
treeherder | mozilla-inbound@70768edfd562 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | jgilbert |
bugs | 1365067 |
milestone | 55.0a1 |
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
|
--- a/gfx/gl/GLContextProviderEGL.cpp +++ b/gfx/gl/GLContextProviderEGL.cpp @@ -492,17 +492,19 @@ GLContextEGL::CreateGLContext(CreateCont if (flags & CreateContextFlags::PREFER_ROBUSTNESS) { if (sEGLLibrary.IsExtensionSupported(GLLibraryEGL::EXT_create_context_robustness)) { robustness_attribs = required_attribs; robustness_attribs.push_back(LOCAL_EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_EXT); robustness_attribs.push_back(LOCAL_EGL_LOSE_CONTEXT_ON_RESET_EXT); // Skip EGL_CONTEXT_OPENGL_ROBUST_ACCESS_EXT, since it doesn't help us. } - if (sEGLLibrary.IsExtensionSupported(GLLibraryEGL::KHR_create_context)) { + if (sEGLLibrary.IsExtensionSupported(GLLibraryEGL::KHR_create_context) && + !sEGLLibrary.IsANGLE()) + { rbab_attribs = required_attribs; rbab_attribs.push_back(LOCAL_EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_KHR); rbab_attribs.push_back(LOCAL_EGL_LOSE_CONTEXT_ON_RESET_KHR); rbab_attribs.push_back(LOCAL_EGL_CONTEXT_FLAGS_KHR); rbab_attribs.push_back(LOCAL_EGL_CONTEXT_OPENGL_ROBUST_ACCESS_BIT_KHR); } }