OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ui/gl/gl_implementation_osmesa.h" | 5 #include "ui/gl/gl_implementation_osmesa.h" |
6 | 6 |
7 #include "base/files/file_path.h" | 7 #include "base/files/file_path.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/native_library.h" | 9 #include "base/native_library.h" |
10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
11 #include "ui/gl/gl_bindings.h" | 11 #include "ui/gl/gl_bindings.h" |
12 #include "ui/gl/gl_gl_api_implementation.h" | 12 #include "ui/gl/gl_gl_api_implementation.h" |
13 #include "ui/gl/gl_implementation.h" | 13 #include "ui/gl/gl_implementation.h" |
14 #include "ui/gl/gl_osmesa_api_implementation.h" | 14 #include "ui/gl/gl_osmesa_api_implementation.h" |
15 | 15 |
16 namespace gfx { | 16 namespace gfx { |
17 | 17 |
18 // Load a library, printing an error message on failure. | 18 // Load a library, printing an error message on failure. |
19 base::NativeLibrary LoadLibrary(const base::FilePath& filename) { | 19 base::NativeLibrary LoadLibrary(const base::FilePath& filename) { |
20 std::string error; | 20 base::NativeLibraryLoadError error; |
21 base::NativeLibrary library = base::LoadNativeLibrary(filename, &error); | 21 base::NativeLibrary library = base::LoadNativeLibrary(filename, &error); |
22 if (!library) { | 22 if (!library) { |
23 DVLOG(1) << "Failed to load " << filename.MaybeAsASCII() << ": " << error; | 23 DVLOG(1) << "Failed to load " << filename.MaybeAsASCII() << ": " |
| 24 << error.ToString(); |
24 return NULL; | 25 return NULL; |
25 } | 26 } |
26 return library; | 27 return library; |
27 } | 28 } |
28 | 29 |
29 base::NativeLibrary LoadLibrary(const char* filename) { | 30 base::NativeLibrary LoadLibrary(const char* filename) { |
30 return LoadLibrary(base::FilePath(filename)); | 31 return LoadLibrary(base::FilePath(filename)); |
31 } | 32 } |
32 | 33 |
33 bool InitializeStaticGLBindingsOSMesaGL() { | 34 bool InitializeStaticGLBindingsOSMesaGL() { |
(...skipping 23 matching lines...) Expand all Loading... |
57 SetGLGetProcAddressProc(get_proc_address); | 58 SetGLGetProcAddressProc(get_proc_address); |
58 AddGLNativeLibrary(library); | 59 AddGLNativeLibrary(library); |
59 SetGLImplementation(kGLImplementationOSMesaGL); | 60 SetGLImplementation(kGLImplementationOSMesaGL); |
60 | 61 |
61 InitializeStaticGLBindingsGL(); | 62 InitializeStaticGLBindingsGL(); |
62 InitializeStaticGLBindingsOSMESA(); | 63 InitializeStaticGLBindingsOSMESA(); |
63 return true; | 64 return true; |
64 } | 65 } |
65 | 66 |
66 } // namespace gfx | 67 } // namespace gfx |
OLD | NEW |