diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-11 02:45:11 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-11 02:45:11 +0000 |
| commit | 0e7e8c0e6ee3def09065c18385daa0fce8f45ff8 (patch) | |
| tree | 4de2e502e1ea9e057ab3502429056be7c029fa0b /app | |
| parent | c066e7d1504b20cad03c479df90118f335e713ef (diff) | |
| download | chromium_src-0e7e8c0e6ee3def09065c18385daa0fce8f45ff8.zip chromium_src-0e7e8c0e6ee3def09065c18385daa0fce8f45ff8.tar.gz chromium_src-0e7e8c0e6ee3def09065c18385daa0fce8f45ff8.tar.bz2 | |
Revert 77769 - Reland 77766
Preload D3DCompiler_42.dll.
This needs to be loaded before the sandbox is turned on.
TEST=The DLL is not loaded after initialization
BUG=none
TBR=apatrick@chromium.org
Review URL: http://codereview.chromium.org/6672020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77772 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app')
| -rw-r--r-- | app/gfx/gl/gl_context_egl.cc | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/app/gfx/gl/gl_context_egl.cc b/app/gfx/gl/gl_context_egl.cc index b899759..a367cd8 100644 --- a/app/gfx/gl/gl_context_egl.cc +++ b/app/gfx/gl/gl_context_egl.cc @@ -13,11 +13,6 @@ // it brings in #defines that cause conflicts. #include "app/gfx/gl/gl_bindings.h" -#if defined(OS_WIN) -#include <d3d11.h> -#include <d3dcompiler.h> -#endif - #if defined(OS_LINUX) extern "C" { #include <X11/Xlib.h> @@ -95,15 +90,6 @@ bool BaseEGLContext::InitializeOneOff() { #else EGLNativeDisplayType native_display = EGL_DEFAULT_DISPLAY; #endif - -#if defined(OS_WIN) - FilePath module_path; - if (!PathService::Get(base::DIR_MODULE, &module_path)) - return false; - - base::LoadNativeLibrary(module_path.Append(D3DCOMPILER_DLL)); -#endif - g_display = eglGetDisplay(native_display); if (!g_display) { LOG(ERROR) << "eglGetDisplay failed with error " << GetLastEGLErrorString(); |