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

Side by Side Diff: src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp

Issue 1494963002: Load ANGLE EGL library correctly on Linux (Closed) Base URL: https://skia.googlesource.com/skia.git@commandbuffer-as-api-04-extended-config
Patch Set: remove patch dependency Created 5 years 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 | « no previous file | 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 1
2 /* 2 /*
3 * Copyright 2012 Google Inc. 3 * Copyright 2012 Google Inc.
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 #include "gl/GrGLInterface.h" 9 #include "gl/GrGLInterface.h"
10 #include "gl/GrGLAssembleInterface.h" 10 #include "gl/GrGLAssembleInterface.h"
(...skipping 27 matching lines...) Expand all
38 if (nullptr == gLibs.fGLLib) { 38 if (nullptr == gLibs.fGLLib) {
39 // We load the ANGLE library and never let it go 39 // We load the ANGLE library and never let it go
40 #if defined _WIN32 40 #if defined _WIN32
41 gLibs.fGLLib = DynamicLoadLibrary("libGLESv2.dll"); 41 gLibs.fGLLib = DynamicLoadLibrary("libGLESv2.dll");
42 gLibs.fEGLLib = DynamicLoadLibrary("libEGL.dll"); 42 gLibs.fEGLLib = DynamicLoadLibrary("libEGL.dll");
43 #elif defined SK_BUILD_FOR_MAC 43 #elif defined SK_BUILD_FOR_MAC
44 gLibs.fGLLib = DynamicLoadLibrary("libGLESv2.dylib"); 44 gLibs.fGLLib = DynamicLoadLibrary("libGLESv2.dylib");
45 gLibs.fEGLLib = DynamicLoadLibrary("libEGL.dylib"); 45 gLibs.fEGLLib = DynamicLoadLibrary("libEGL.dylib");
46 #else 46 #else
47 gLibs.fGLLib = DynamicLoadLibrary("libGLESv2.so"); 47 gLibs.fGLLib = DynamicLoadLibrary("libGLESv2.so");
48 gLibs.fGLLib = DynamicLoadLibrary("libEGL.so"); 48 gLibs.fEGLLib = DynamicLoadLibrary("libEGL.so");
49 #endif 49 #endif
50 } 50 }
51 51
52 if (nullptr == gLibs.fGLLib || nullptr == gLibs.fEGLLib) { 52 if (nullptr == gLibs.fGLLib || nullptr == gLibs.fEGLLib) {
53 // We can't setup the interface correctly w/o the so 53 // We can't setup the interface correctly w/o the so
54 return nullptr; 54 return nullptr;
55 } 55 }
56 56
57 return GrGLAssembleGLESInterface(&gLibs, angle_get_gl_proc); 57 return GrGLAssembleGLESInterface(&gLibs, angle_get_gl_proc);
58 } 58 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698