Bug 1317569 - Stop testing d3dcompiler_43.dll during EGL initialization. r=jrmuizel

MozReview-Commit-ID: BDtgOD4Elba

--HG--
extra : rebase_source : cea0c8f56084822a03972bca61ae9a6f3566ad54
extra : source : 18477e73fc758633d7a87bfe57d951a87525eede
This commit is contained in:
Masatoshi Kimura 2016-11-15 07:02:49 +09:00
Родитель a654e25d18
Коммит 0b4ad7bfb1
1 изменённых файлов: 3 добавлений и 8 удалений

Просмотреть файл

@ -321,10 +321,10 @@ GLLibraryEGL::EnsureInitialized(bool forceAccel, nsACString* const out_failureId
// 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;
@ -334,11 +334,6 @@ GLLibraryEGL::EnsureInitialized(bool forceAccel, nsACString* const out_failureId
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);