commit 0677631ac394a87922e40c07d8d4fc3afe304f4b
author Geoff Lang <geofflang@chromium.org> Tue Oct 15 16:07:12 2013 -0400
committer Geoff Lang <geofflang@chromium.org> Tue Oct 15 16:15:49 2013 -0400
tree 7c4f1605974c11b1f0376827fe2985e7f74afdaa
parent 5e70cf9d0b1bb9237f0d9d4fc52c4ff1a095c728

Fall back to LoadLibrary if preloading d3d compiler modules fails.

R=zmo@chromium.org, shannonwoods@chromium.org, jmadill@chromium.org

Review URL: https://codereview.appspot.com/14532049

src/libGLESv2/renderer/Renderer.cpp

diff --git a/src/libGLESv2/renderer/Renderer.cpp b/src/libGLESv2/renderer/Renderer.cpp
index 70b9326..e0b3abc 100644
--- a/src/libGLESv2/renderer/Renderer.cpp
+++ b/src/libGLESv2/renderer/Renderer.cpp
@@ -53,13 +53,16 @@
             break;
         }
     }
-#else
-    // Load the version of the D3DCompiler DLL associated with the Direct3D version ANGLE was built with.
-    mD3dCompilerModule = LoadLibrary(D3DCOMPILER_DLL);
 #endif  // ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES
 
     if (!mD3dCompilerModule)
     {
+        // Load the version of the D3DCompiler DLL associated with the Direct3D version ANGLE was built with.
+        mD3dCompilerModule = LoadLibrary(D3DCOMPILER_DLL);
+    }
+
+    if (!mD3dCompilerModule)
+    {
         ERR("No D3D compiler module found - aborting!\n");
         return false;
     }