diff options
| -rw-r--r-- | content/content_common.gypi | 2 | ||||
| -rw-r--r-- | content/content_gpu.gypi | 20 | ||||
| -rw-r--r-- | ui/gl/gl_implementation_win.cc | 4 |
3 files changed, 25 insertions, 1 deletions
diff --git a/content/content_common.gypi b/content/content_common.gypi index b2b47a3..35aedb1 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -531,6 +531,7 @@ 'link_settings': { 'libraries': [ '-ld3d9.lib', + '-ld3dx9.lib', '-ldxva2.lib', '-lstrmiids.lib', '-lmf.lib', @@ -542,6 +543,7 @@ 'AdditionalLibraryDirectories': ['$(DXSDK_DIR)/lib/x86'], 'DelayLoadDLLs': [ 'd3d9.dll', + 'd3dx9_43.dll', 'dxva2.dll', 'mf.dll', 'mfplat.dll', diff --git a/content/content_gpu.gypi b/content/content_gpu.gypi index abf746b..66cb3c6 100644 --- a/content/content_gpu.gypi +++ b/content/content_gpu.gypi @@ -48,6 +48,26 @@ ['OS=="win" and directxsdk_exists=="True"', { 'actions': [ { + 'action_name': 'extract_d3dx9', + 'variables': { + 'input': 'Jun2010_d3dx9_43_x86.cab', + 'output': 'd3dx9_43.dll', + }, + 'inputs': [ + '../third_party/directxsdk/files/Redist/<(input)', + ], + 'outputs': [ + '<(PRODUCT_DIR)/<(output)', + ], + 'action': [ + 'python', + '../build/extract_from_cab.py', + '..\\third_party\\directxsdk\\files\\Redist\\<(input)', + '<(output)', + '<(PRODUCT_DIR)', + ], + }, + { 'action_name': 'extract_d3dcompiler', 'variables': { 'input': 'Jun2010_D3DCompiler_43_x86.cab', 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(); |