diff options
Diffstat (limited to 'chromium/ui/gl/gl_implementation_win.cc')
| -rw-r--r-- | chromium/ui/gl/gl_implementation_win.cc | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/chromium/ui/gl/gl_implementation_win.cc b/chromium/ui/gl/gl_implementation_win.cc index 87328a306f8..338fa02d3ec 100644 --- a/chromium/ui/gl/gl_implementation_win.cc +++ b/chromium/ui/gl/gl_implementation_win.cc @@ -36,6 +36,14 @@ namespace { const wchar_t kPreVistaD3DCompiler[] = L"D3DCompiler_43.dll"; const wchar_t kPostVistaD3DCompiler[] = L"D3DCompiler_46.dll"; +#if defined(NDEBUG) +const wchar_t kQtGLESv2Library[] = L"libglesv2.dll"; +const wchar_t kQtEGLLibrary[] = L"libegl.dll"; +#else +const wchar_t kQtGLESv2Library[] = L"libglesv2d.dll"; +const wchar_t kQtEGLLibrary[] = L"libegld.dll"; +#endif + void GL_BINDING_CALL MarshalClearDepthToClearDepthf(GLclampd depth) { glClearDepthf(static_cast<GLclampf>(depth)); } @@ -185,18 +193,18 @@ bool InitializeGLBindings(GLImplementation implementation) { // the former and if there is another version of libglesv2.dll in the dll // search path, it will get loaded instead. base::NativeLibrary gles_library = base::LoadNativeLibrary( - gles_path.Append(L"libglesv2.dll"), NULL); + gles_path.Append(kQtGLESv2Library), NULL); if (!gles_library) { - DVLOG(1) << "libglesv2.dll not found"; + DVLOG(1) << kQtGLESv2Library << " not found"; return false; } // When using EGL, first try eglGetProcAddress and then Windows // GetProcAddress on both the EGL and GLES2 DLLs. base::NativeLibrary egl_library = base::LoadNativeLibrary( - gles_path.Append(L"libegl.dll"), NULL); + gles_path.Append(kQtEGLLibrary), NULL); if (!egl_library) { - DVLOG(1) << "libegl.dll not found."; + DVLOG(1) << kQtEGLLibrary << " not found."; base::UnloadNativeLibrary(gles_library); return false; } |