Bug 1317569 - Stop testing d3dcompiler_43.dll during EGL initialization. r?jrmuizel draft
authorMasatoshi Kimura <VYV03354@nifty.ne.jp>
Tue, 15 Nov 2016 07:02:49 +0900
changeset 452623 c7df816875a012962b091e0e28868e45642a87c6
parent 452622 6be3a314825cf8642c1f14dfac184224a5640de0
child 540246 07022ea22851f64872094b54d433e133b75dded2
push id39425
push userVYV03354@nifty.ne.jp
push dateWed, 21 Dec 2016 21:31:58 +0000
reviewersjrmuizel
bugs1317569
milestone53.0a1
Bug 1317569 - Stop testing d3dcompiler_43.dll during EGL initialization. r?jrmuizel MozReview-Commit-ID: BDtgOD4Elba
gfx/gl/GLLibraryEGL.cpp
--- a/gfx/gl/GLLibraryEGL.cpp
+++ b/gfx/gl/GLLibraryEGL.cpp
@@ -316,34 +316,29 @@ GLLibraryEGL::EnsureInitialized(bool for
         // we should look for them there. We have to load the libs in this
         // order, because libEGL.dll depends on libGLESv2.dll which depends on the DXSDK
         // libraries. This matters especially for WebRT apps which are in a different directory.
         // See bug 760323 and bug 749459
 
         // Also note that we intentionally leak the libs we load.
 
         do {
-            // Windows 8.1 has d3dcompiler_47.dll in the system directory.
+            // Windows 8.1+ has d3dcompiler_47.dll in the system directory.
             // Try it first. Note that _46 will never be in the system
-            // directory and we ship with at least _43. So there is no point
-            // trying _46 and _43 in the system directory.
+            // directory. So there is no point trying _46 in the system
+            // directory.
 
             if (LoadLibrarySystem32(L"d3dcompiler_47.dll"))
                 break;
 
 #ifdef MOZ_D3DCOMPILER_VISTA_DLL
             if (LoadLibraryForEGLOnWindows(NS_LITERAL_STRING(NS_STRINGIFY(MOZ_D3DCOMPILER_VISTA_DLL))))
                 break;
 #endif
 
-#ifdef MOZ_D3DCOMPILER_XP_DLL
-            if (LoadLibraryForEGLOnWindows(NS_LITERAL_STRING(NS_STRINGIFY(MOZ_D3DCOMPILER_XP_DLL))))
-                break;
-#endif
-
             MOZ_ASSERT(false, "d3dcompiler DLL loading failed.");
         } while (false);
 
         LoadLibraryForEGLOnWindows(NS_LITERAL_STRING("libGLESv2.dll"));
 
         mEGLLibrary = LoadLibraryForEGLOnWindows(NS_LITERAL_STRING("libEGL.dll"));
 
         if (!mEGLLibrary) {