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

Fall back to LoadLibrary if preloading d3d compiler modules fails.
0677631a · Geoff Lang · 5e70cf9d · 0677631a
Commit 0677631a authored Oct 15, 2013 by Geoff Lang
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

Renderer.cpp src/libGLESv2/renderer/Renderer.cpp +6 -3

No files found.
--- a/src/libGLESv2/renderer/Renderer.cpp
+++ b/src/libGLESv2/renderer/Renderer.cpp
@@ -53,13 +53,16 @@ bool Renderer::initializeCompiler()
            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;
    }