commit eb278cb04e970ad823ae09e9d4348f88879de6c0
author Jamie Madill <jmadill@chromium.org> Mon Jan 07 13:49:36 2019 -0500
committer Commit Bot <commit-bot@chromium.org> Tue Jan 08 01:55:50 2019 +0000
tree 2c96e8bed6867c98af46af6f06859e3d0962a11f
parent 5df1d281a992fb221f243d532c70ad0398c9410a

D3D: Log GetLastError when compiler load fails.

Also use the non-unicode version of LoadLibrary explicitly.

Bug: chromium:919163
Change-Id: I4841c3eef586ff57563915da12765baaa6e0b146
Reviewed-on: https://chromium-review.googlesource.com/c/1398642
Reviewed-by: Bruce Dawson <brucedawson@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

src/libANGLE/renderer/d3d/HLSLCompiler.cpp

diff --git a/src/libANGLE/renderer/d3d/HLSLCompiler.cpp b/src/libANGLE/renderer/d3d/HLSLCompiler.cpp
index 22c01ea..371471e 100644
--- a/src/libANGLE/renderer/d3d/HLSLCompiler.cpp
+++ b/src/libANGLE/renderer/d3d/HLSLCompiler.cpp
@@ -130,14 +130,17 @@
     {
         // Load the version of the D3DCompiler DLL associated with the Direct3D version ANGLE was
         // built with.
-        mD3DCompilerModule = LoadLibrary(D3DCOMPILER_DLL);
+        mD3DCompilerModule = LoadLibraryA(D3DCOMPILER_DLL_A);
+
+        if (!mD3DCompilerModule)
+        {
+            DWORD lastError = GetLastError();
+            ERR() << "LoadLibrary(" << D3DCOMPILER_DLL_A << ") failed. GetLastError=" << lastError;
+            ANGLE_TRY_HR(context, E_OUTOFMEMORY, "LoadLibrary failed to load D3D Compiler DLL.");
+        }
     }
 
-    if (!mD3DCompilerModule)
-    {
-        ERR() << "D3D compiler module not found.";
-        ANGLE_TRY_HR(context, E_OUTOFMEMORY, "D3D compiler module not found.");
-    }
+    ASSERT(mD3DCompilerModule);
 
     mD3DCompileFunc =
         reinterpret_cast<pD3DCompile>(GetProcAddress(mD3DCompilerModule, "D3DCompile"));