OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 <string> | 5 #include <string> |
6 | 6 |
7 #include "app/app_switches.h" | 7 #include "app/app_switches.h" |
8 #include "app/gfx/gl/gl_context.h" | 8 #include "app/gfx/gl/gl_context.h" |
9 #include "app/gfx/gl/gl_bindings.h" | 9 #include "app/gfx/gl/gl_bindings.h" |
10 #include "app/gfx/gl/gl_implementation.h" | 10 #include "app/gfx/gl/gl_implementation.h" |
11 #include "base/command_line.h" | 11 #include "base/command_line.h" |
12 #include "base/logging.h" | 12 #include "base/logging.h" |
13 | 13 |
14 namespace gfx { | 14 namespace gfx { |
15 | 15 |
16 std::string GLContext::GetExtensions() { | 16 std::string GLContext::GetExtensions() { |
17 DCHECK(IsCurrent()); | 17 DCHECK(IsCurrent()); |
18 return std::string(reinterpret_cast<const char*>(glGetString(GL_EXTENSIONS))); | 18 const char* ext = reinterpret_cast<const char*>(glGetString(GL_EXTENSIONS)); |
| 19 return std::string(ext ? ext : ""); |
19 } | 20 } |
20 | 21 |
21 bool GLContext::HasExtension(const char* name) { | 22 bool GLContext::HasExtension(const char* name) { |
22 std::string extensions = GetExtensions(); | 23 std::string extensions = GetExtensions(); |
23 extensions += " "; | 24 extensions += " "; |
24 | 25 |
25 std::string delimited_name(name); | 26 std::string delimited_name(name); |
26 delimited_name += " "; | 27 delimited_name += " "; |
27 | 28 |
28 return extensions.find(delimited_name) != std::string::npos; | 29 return extensions.find(delimited_name) != std::string::npos; |
(...skipping 15 matching lines...) Expand all Loading... |
44 glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT); | 45 glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT); |
45 if (glGetError() != GL_NO_ERROR) { | 46 if (glGetError() != GL_NO_ERROR) { |
46 LOG(ERROR) << "glClear failed."; | 47 LOG(ERROR) << "glClear failed."; |
47 return false; | 48 return false; |
48 } | 49 } |
49 | 50 |
50 return true; | 51 return true; |
51 } | 52 } |
52 | 53 |
53 } // namespace gfx | 54 } // namespace gfx |
OLD | NEW |