Fall back to LoadLibrary if preloading d3d compiler modules fails.

TRAC #23985 Signed-off-by: Jamie Madill Signed-off-by: Shannon Woods

Fall back to LoadLibrary if preloading d3d compiler modules fails.
f6d6901c · Geoff Lang · c1f8b16b · f6d6901c
Commit f6d6901c authored Oct 07, 2013 by Geoff Lang
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

Renderer.cpp src/libGLESv2/renderer/Renderer.cpp +5 -2

No files found.
--- a/src/libGLESv2/renderer/Renderer.cpp
+++ b/src/libGLESv2/renderer/Renderer.cpp
@@ -54,10 +54,13 @@ bool Renderer::initializeCompiler()
            break;
        }
    }
-#else
+#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);
-#endif  // ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES
+    }
    if (!mD3dCompilerModule)
    {