Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(19)

Side by Side Diff: ui/gl/gl_implementation_osmesa.cc

Issue 1946873005: Move LoadLibraryAndPrintError helpers to common gl_implementation.h/.cc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and use base::FilePath::CharType to fix build failure on win os Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ui/gl/gl_implementation_osmesa.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 base::NativeLibrary LoadLibraryAndPrintError(const base::FilePath& filename) {
19 base::NativeLibraryLoadError error;
20 base::NativeLibrary library = base::LoadNativeLibrary(filename, &error);
21 if (!library) {
22 LOG(ERROR) << "Failed to load " << filename.MaybeAsASCII() << ": "
23 << error.ToString();
24 return NULL;
25 }
26 return library;
27 }
28
29 base::NativeLibrary LoadLibraryAndPrintError(const char* filename) {
30 return LoadLibraryAndPrintError(base::FilePath(filename));
31 }
32
33 bool InitializeStaticGLBindingsOSMesaGL() { 18 bool InitializeStaticGLBindingsOSMesaGL() {
34 base::FilePath module_path; 19 base::FilePath module_path;
35 if (!PathService::Get(base::DIR_MODULE, &module_path)) { 20 if (!PathService::Get(base::DIR_MODULE, &module_path)) {
36 LOG(ERROR) << "PathService::Get failed."; 21 LOG(ERROR) << "PathService::Get failed.";
37 return false; 22 return false;
38 } 23 }
39 24
40 base::FilePath library_path = module_path.Append("libosmesa.so"); 25 base::FilePath library_path = module_path.Append("libosmesa.so");
41 base::NativeLibrary library = LoadLibraryAndPrintError(library_path); 26 base::NativeLibrary library = LoadLibraryAndPrintError(library_path);
42 if (!library) 27 if (!library)
(...skipping 12 matching lines...) Expand all
55 SetGLGetProcAddressProc(get_proc_address); 40 SetGLGetProcAddressProc(get_proc_address);
56 AddGLNativeLibrary(library); 41 AddGLNativeLibrary(library);
57 SetGLImplementation(kGLImplementationOSMesaGL); 42 SetGLImplementation(kGLImplementationOSMesaGL);
58 43
59 InitializeStaticGLBindingsGL(); 44 InitializeStaticGLBindingsGL();
60 InitializeStaticGLBindingsOSMESA(); 45 InitializeStaticGLBindingsOSMESA();
61 return true; 46 return true;
62 } 47 }
63 48
64 } // namespace gfx 49 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gl/gl_implementation_osmesa.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698