summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-04 21:50:09 +0000
committerapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-04 21:50:09 +0000
commit8310c3cec4a6e60298c87685b270aa1010e7b071 (patch)
treea3662743e3619d081e8961e033facea534382955 /ui
parent2c495c4fd23dca3b3025861d49c3711a8f635fdf (diff)
downloadchromium_src-8310c3cec4a6e60298c87685b270aa1010e7b071.zip
chromium_src-8310c3cec4a6e60298c87685b270aa1010e7b071.tar.gz
chromium_src-8310c3cec4a6e60298c87685b270aa1010e7b071.tar.bz2
Windows: Remove content's dependency on d3dx9_43.dll.
ANGLE doesn't need this loaded anymore. Review URL: https://chromiumcodereview.appspot.com/11737027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175201 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
-rw-r--r--ui/gl/gl_implementation_win.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/ui/gl/gl_implementation_win.cc b/ui/gl/gl_implementation_win.cc
index ac1e3bf..459598b 100644
--- a/ui/gl/gl_implementation_win.cc
+++ b/ui/gl/gl_implementation_win.cc
@@ -115,14 +115,12 @@ bool InitializeGLBindings(GLImplementation implementation) {
if (!PathService::Get(base::DIR_MODULE, &module_path))
return false;
- // Attempt to load D3DX and its dependencies using the default search path
+ // Attempt to load the D3DX shader compiler 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();