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

Unified Diff: ui/gfx/gl/gl_implementation_mac.cc

Issue 7019041: Fix up PathProvider on the Mac for FILE_MODULE. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: moved os mesa libraries on mac to better location Created 9 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 side-by-side diff with in-line comments
Download patch
« chrome/chrome_exe.gypi ('K') | « chrome/chrome_exe.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/gl/gl_implementation_mac.cc
diff --git a/ui/gfx/gl/gl_implementation_mac.cc b/ui/gfx/gl/gl_implementation_mac.cc
index a8b3ddd7f61c53629f7939048666e1e648828218..351bc11c2ac22f3987e03b96ab46f70a0bc584c9 100644
--- a/ui/gfx/gl/gl_implementation_mac.cc
+++ b/ui/gfx/gl/gl_implementation_mac.cc
@@ -31,6 +31,10 @@ bool InitializeGLBindings(GLImplementation implementation) {
return false;
}
+ // osmesa.so is located in:
+ // Contents/Versions/<vers>/Chromium Framework.framework/Libraries
+ module_path = module_path.DirName().Append("Libraries");
+
// When using OSMesa, just use OSMesaGetProcAddress to find entry points.
base::NativeLibrary library = base::LoadNativeLibrary(
module_path.Append("osmesa.so"), NULL);
« chrome/chrome_exe.gypi ('K') | « chrome/chrome_exe.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698