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

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

Issue 1635243002: On X11, copy ANGLE's libraries instead of using the _ANGLE version (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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.gyp ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <vector> 5 #include <vector>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/threading/thread_restrictions.h" 10 #include "base/threading/thread_restrictions.h"
(...skipping 24 matching lines...) Expand all
35 35
36 #if defined(OS_OPENBSD) 36 #if defined(OS_OPENBSD)
37 const char kGLLibraryName[] = "libGL.so"; 37 const char kGLLibraryName[] = "libGL.so";
38 #else 38 #else
39 const char kGLLibraryName[] = "libGL.so.1"; 39 const char kGLLibraryName[] = "libGL.so.1";
40 #endif 40 #endif
41 41
42 const char kGLESv2LibraryName[] = "libGLESv2.so.2"; 42 const char kGLESv2LibraryName[] = "libGLESv2.so.2";
43 const char kEGLLibraryName[] = "libEGL.so.1"; 43 const char kEGLLibraryName[] = "libEGL.so.1";
44 44
45 const char kGLESv2ANGLELibraryName[] = "libGLESv2_ANGLE.so"; 45 const char kGLESv2ANGLELibraryName[] = "libGLESv2.so";
46 const char kEGLANGLELibraryName[] = "libEGL_ANGLE.so"; 46 const char kEGLANGLELibraryName[] = "libEGL.so";
47 47
48 } // namespace 48 } // namespace
49 49
50 void GetAllowedGLImplementations(std::vector<GLImplementation>* impls) { 50 void GetAllowedGLImplementations(std::vector<GLImplementation>* impls) {
51 impls->push_back(kGLImplementationDesktopGL); 51 impls->push_back(kGLImplementationDesktopGL);
52 impls->push_back(kGLImplementationEGLGLES2); 52 impls->push_back(kGLImplementationEGLGLES2);
53 impls->push_back(kGLImplementationOSMesaGL); 53 impls->push_back(kGLImplementationOSMesaGL);
54 } 54 }
55 55
56 bool InitializeStaticGLBindings(GLImplementation implementation) { 56 bool InitializeStaticGLBindings(GLImplementation implementation) {
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 return GetGLWindowSystemBindingInfoGLX(info); 212 return GetGLWindowSystemBindingInfoGLX(info);
213 case kGLImplementationEGLGLES2: 213 case kGLImplementationEGLGLES2:
214 return GetGLWindowSystemBindingInfoEGL(info); 214 return GetGLWindowSystemBindingInfoEGL(info);
215 default: 215 default:
216 return false; 216 return false;
217 } 217 }
218 return false; 218 return false;
219 } 219 }
220 220
221 } // namespace gfx 221 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gl/gl.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698