--- angleproject/src/libEGL/Display.cpp.orig 2014-01-25 15:30:03.270544160 +0100
+++ angleproject/src/libEGL/Display.cpp 2014-01-25 15:32:30.168018505 +0100
@@ -142,14 +142,18 @@
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
-
+ // Load the version of the D3DCompiler DLL associated with the Direct3D version ANGLE was built with.
+ if (!mD3dCompilerModule)
+ {
+ // Load the version of the D3DCompiler DLL associated with the Direct3D version ANGLE was built with.
+ mD3dCompilerModule = LoadLibrary(D3DCOMPILER_DLL);
+ }
+
if (!mD3dCompilerModule)
{
terminate();
+ ERR("No D3D compiler module found - aborting!\n");
return false;
}