From 0e7e8c0e6ee3def09065c18385daa0fce8f45ff8 Mon Sep 17 00:00:00 2001 From: "apatrick@chromium.org" Date: Fri, 11 Mar 2011 02:45:11 +0000 Subject: 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 --- app/gfx/gl/gl_context_egl.cc | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'app') 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 -#include -#endif - #if defined(OS_LINUX) extern "C" { #include @@ -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(); -- cgit v1.1