| OLD | NEW |
| 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 extern "C" { | 5 extern "C" { |
| 6 #include <X11/Xlib.h> | 6 #include <X11/Xlib.h> |
| 7 } | 7 } |
| 8 | 8 |
| 9 #include "ui/gl/gl_context_glx.h" | 9 #include "ui/gl/gl_context_glx.h" |
| 10 | 10 |
| 11 #include "base/debug/trace_event.h" | 11 #include "base/debug/trace_event.h" |
| 12 #include "base/logging.h" | 12 #include "base/logging.h" |
| 13 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
| 14 #include "third_party/mesa/src/include/GL/osmesa.h" | |
| 15 #include "ui/gl/GL/glextchromium.h" | 14 #include "ui/gl/GL/glextchromium.h" |
| 16 #include "ui/gl/gl_bindings.h" | 15 #include "ui/gl/gl_bindings.h" |
| 17 #include "ui/gl/gl_implementation.h" | 16 #include "ui/gl/gl_implementation.h" |
| 18 #include "ui/gl/gl_surface_glx.h" | 17 #include "ui/gl/gl_surface_glx.h" |
| 19 | 18 |
| 20 namespace gfx { | 19 namespace gfx { |
| 21 | 20 |
| 22 GLContextGLX::GLContextGLX(GLShareGroup* share_group) | 21 GLContextGLX::GLContextGLX(GLShareGroup* share_group) |
| 23 : GLContextReal(share_group), | 22 : GLContextReal(share_group), |
| 24 context_(NULL), | 23 context_(NULL), |
| (...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 207 | 206 |
| 208 bool GLContextGLX::WasAllocatedUsingRobustnessExtension() { | 207 bool GLContextGLX::WasAllocatedUsingRobustnessExtension() { |
| 209 return GLSurfaceGLX::IsCreateContextRobustnessSupported(); | 208 return GLSurfaceGLX::IsCreateContextRobustnessSupported(); |
| 210 } | 209 } |
| 211 | 210 |
| 212 GLContextGLX::~GLContextGLX() { | 211 GLContextGLX::~GLContextGLX() { |
| 213 Destroy(); | 212 Destroy(); |
| 214 } | 213 } |
| 215 | 214 |
| 216 } // namespace gfx | 215 } // namespace gfx |
| OLD | NEW |