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

Side by Side Diff: ui/gl/gl_implementation.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.h ('k') | ui/gl/gl_implementation_osmesa.h » ('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) 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 "ui/gl/gl_implementation.h" 5 #include "ui/gl/gl_implementation.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <string> 10 #include <string>
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 const char* version_str = 205 const char* version_str =
206 reinterpret_cast<const char*>(glGetString(GL_VERSION)); 206 reinterpret_cast<const char*>(glGetString(GL_VERSION));
207 unsigned major_version, minor_version; 207 unsigned major_version, minor_version;
208 bool is_es, is_es2, is_es3; 208 bool is_es, is_es2, is_es3;
209 gfx::GLVersionInfo::ParseVersionString( 209 gfx::GLVersionInfo::ParseVersionString(
210 version_str, &major_version, &minor_version, 210 version_str, &major_version, &minor_version,
211 &is_es, &is_es2, &is_es3); 211 &is_es, &is_es2, &is_es3);
212 return is_es || major_version < 3; 212 return is_es || major_version < 3;
213 } 213 }
214 214
215 base::NativeLibrary LoadLibraryAndPrintError(
216 const base::FilePath::CharType* filename) {
217 return LoadLibraryAndPrintError(base::FilePath(filename));
218 }
219
220 base::NativeLibrary LoadLibraryAndPrintError(const base::FilePath& filename) {
221 base::NativeLibraryLoadError error;
222 base::NativeLibrary library = base::LoadNativeLibrary(filename, &error);
223 if (!library) {
224 LOG(ERROR) << "Failed to load " << filename.MaybeAsASCII() << ": "
225 << error.ToString();
226 return NULL;
227 }
228 return library;
229 }
230
215 } // namespace gfx 231 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gl/gl_implementation.h ('k') | ui/gl/gl_implementation_osmesa.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698