diff options
| author | dharani@google.com <dharani@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-06 16:00:39 +0000 |
|---|---|---|
| committer | dharani@google.com <dharani@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-06 16:00:39 +0000 |
| commit | 91a517a760cec07b672be6d3975d2c8128841177 (patch) | |
| tree | 72303a3767e73742943911b44d2cba09bcffefcb /ui | |
| parent | 7c39486cdfb750c2bb0f6e1f4b71a7364ed23c30 (diff) | |
| download | chromium_src-91a517a760cec07b672be6d3975d2c8128841177.zip chromium_src-91a517a760cec07b672be6d3975d2c8128841177.tar.gz chromium_src-91a517a760cec07b672be6d3975d2c8128841177.tar.bz2 | |
Revert 175201 due to failures in official build.
> Windows: Remove content's dependency on d3dx9_43.dll.
>
> ANGLE doesn't need this loaded anymore.
>
> Review URL: https://chromiumcodereview.appspot.com/11737027
TBR=apatrick@chromium.org
Review URL: https://codereview.chromium.org/11791013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175301 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/gl/gl_implementation_win.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ui/gl/gl_implementation_win.cc b/ui/gl/gl_implementation_win.cc index 459598b..ac1e3bf 100644 --- a/ui/gl/gl_implementation_win.cc +++ b/ui/gl/gl_implementation_win.cc @@ -115,12 +115,14 @@ bool InitializeGLBindings(GLImplementation implementation) { if (!PathService::Get(base::DIR_MODULE, &module_path)) return false; - // Attempt to load the D3DX shader compiler using the default search path + // Attempt to load D3DX and its dependencies using the default search path // and if that fails, using an absolute path. This is to ensure these DLLs // are loaded before ANGLE is loaded in case they are not in the default // search path. LoadD3DXLibrary(module_path, base::StringPrintf(L"d3dcompiler_%d.dll", kPinnedD3DXVersion)); + LoadD3DXLibrary(module_path, base::StringPrintf(L"d3dx9_%d.dll", + kPinnedD3DXVersion)); FilePath gles_path; const CommandLine* command_line = CommandLine::ForCurrentProcess(); |