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

Side by Side Diff: ui/gfx/gl/gl_implementation_mac.cc

Issue 6864020: linux: don't always print dlopen errors from LoadNativeLibrary (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: owners Created 9 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « ui/gfx/gl/gl_implementation_linux.cc ('k') | ui/gfx/gl/gl_implementation_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "base/base_paths.h" 5 #include "base/base_paths.h"
6 #include "base/file_path.h" 6 #include "base/file_path.h"
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/native_library.h" 8 #include "base/native_library.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "ui/gfx/gl/gl_bindings.h" 10 #include "ui/gfx/gl/gl_bindings.h"
(...skipping 15 matching lines...) Expand all
26 switch (implementation) { 26 switch (implementation) {
27 case kGLImplementationOSMesaGL: { 27 case kGLImplementationOSMesaGL: {
28 FilePath module_path; 28 FilePath module_path;
29 if (!PathService::Get(base::DIR_MODULE, &module_path)) { 29 if (!PathService::Get(base::DIR_MODULE, &module_path)) {
30 LOG(ERROR) << "PathService::Get failed."; 30 LOG(ERROR) << "PathService::Get failed.";
31 return false; 31 return false;
32 } 32 }
33 33
34 // When using OSMesa, just use OSMesaGetProcAddress to find entry points. 34 // When using OSMesa, just use OSMesaGetProcAddress to find entry points.
35 base::NativeLibrary library = base::LoadNativeLibrary( 35 base::NativeLibrary library = base::LoadNativeLibrary(
36 module_path.Append("osmesa.so")); 36 module_path.Append("osmesa.so"), NULL);
37 if (!library) { 37 if (!library) {
38 VLOG(1) << "osmesa.so not found"; 38 VLOG(1) << "osmesa.so not found";
39 return false; 39 return false;
40 } 40 }
41 41
42 GLGetProcAddressProc get_proc_address = 42 GLGetProcAddressProc get_proc_address =
43 reinterpret_cast<GLGetProcAddressProc>( 43 reinterpret_cast<GLGetProcAddressProc>(
44 base::GetFunctionPointerFromNativeLibrary( 44 base::GetFunctionPointerFromNativeLibrary(
45 library, "OSMesaGetProcAddress")); 45 library, "OSMesaGetProcAddress"));
46 if (!get_proc_address) { 46 if (!get_proc_address) {
47 LOG(ERROR) << "OSMesaGetProcAddress not found."; 47 LOG(ERROR) << "OSMesaGetProcAddress not found.";
48 base::UnloadNativeLibrary(library); 48 base::UnloadNativeLibrary(library);
49 return false; 49 return false;
50 } 50 }
51 51
52 SetGLGetProcAddressProc(get_proc_address); 52 SetGLGetProcAddressProc(get_proc_address);
53 AddGLNativeLibrary(library); 53 AddGLNativeLibrary(library);
54 SetGLImplementation(kGLImplementationOSMesaGL); 54 SetGLImplementation(kGLImplementationOSMesaGL);
55 55
56 InitializeGLBindingsGL(); 56 InitializeGLBindingsGL();
57 InitializeGLBindingsOSMESA(); 57 InitializeGLBindingsOSMESA();
58 break; 58 break;
59 } 59 }
60 case kGLImplementationDesktopGL: { 60 case kGLImplementationDesktopGL: {
61 base::NativeLibrary library = base::LoadNativeLibrary( 61 base::NativeLibrary library = base::LoadNativeLibrary(
62 FilePath(kOpenGLFrameworkPath)); 62 FilePath(kOpenGLFrameworkPath), NULL);
63 if (!library) { 63 if (!library) {
64 LOG(ERROR) << "OpenGL framework not found"; 64 LOG(ERROR) << "OpenGL framework not found";
65 return false; 65 return false;
66 } 66 }
67 67
68 AddGLNativeLibrary(library); 68 AddGLNativeLibrary(library);
69 SetGLImplementation(kGLImplementationDesktopGL); 69 SetGLImplementation(kGLImplementationDesktopGL);
70 70
71 InitializeGLBindingsGL(); 71 InitializeGLBindingsGL();
72 break; 72 break;
(...skipping 10 matching lines...) Expand all
83 83
84 return true; 84 return true;
85 } 85 }
86 86
87 void InitializeDebugGLBindings() { 87 void InitializeDebugGLBindings() {
88 InitializeDebugGLBindingsGL(); 88 InitializeDebugGLBindingsGL();
89 InitializeDebugGLBindingsOSMESA(); 89 InitializeDebugGLBindingsOSMESA();
90 } 90 }
91 91
92 } // namespace gfx 92 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gfx/gl/gl_implementation_linux.cc ('k') | ui/gfx/gl/gl_implementation_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698