Bug 1287182 - Don't clobber the angle platform failureId. r=jrmuizel
authorBenoit Girard <b56girard@gmail.com>
Wed, 03 Aug 2016 17:28:26 -0400
changeset 353662 eb88d96de254a14ee5e7d90c0ea1b20822fd3d6e
parent 353661 e734cf260908cace026d313b6cc55bde3b46730c
child 353663 bbbadfa14ef1611937db1311afa33f3a02030338
push id1324
push usermtabara@mozilla.com
push dateMon, 16 Jan 2017 13:07:44 +0000
treeherdermozilla-release@a01c49833940 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjrmuizel
bugs1287182
milestone51.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
Bug 1287182 - Don't clobber the angle platform failureId. r=jrmuizel MozReview-Commit-ID: Dj0PNznZ7BS
gfx/gl/GLLibraryEGL.cpp
--- a/gfx/gl/GLLibraryEGL.cpp
+++ b/gfx/gl/GLLibraryEGL.cpp
@@ -256,17 +256,17 @@ GetAndInitDisplayForAccelANGLE(GLLibrary
     if (d3d11ANGLE.IsEnabled()) {
         ret = GetAndInitDisplay(egl, LOCAL_EGL_D3D11_ELSE_D3D9_DISPLAY_ANGLE);
     }
 
     if (!ret) {
         ret = GetAndInitDisplay(egl, EGL_DEFAULT_DISPLAY);
     }
 
-    if (!ret) {
+    if (!ret && out_failureId->IsEmpty()) {
         *out_failureId = NS_LITERAL_CSTRING("FEATURE_FAILURE_ACCL_ANGLE_NO_DISP");
     }
 
     return ret;
 }
 
 bool
 GLLibraryEGL::ReadbackEGLImage(EGLImage image, gfx::DataSourceSurface* out_surface)