Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1258)

Unified Diff: ui/gl/gl_implementation_win.cc

Issue 11820033: Reland 175201 with fixes for installer. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/content_gpu.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_implementation_win.cc
===================================================================
--- ui/gl/gl_implementation_win.cc (revision 175607)
+++ ui/gl/gl_implementation_win.cc (working copy)
@@ -115,14 +115,12 @@
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();
« no previous file with comments | « content/content_gpu.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698