| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "app/gfx/gl/gl_context_egl.h" | |
| 6 | 5 |
| 7 #include "build/build_config.h" | 6 #include "build/build_config.h" |
| 8 #include "base/logging.h" | 7 #include "base/logging.h" |
| 9 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 10 #include "third_party/angle/include/EGL/egl.h" | 9 #include "third_party/angle/include/EGL/egl.h" |
| 10 #include "ui/gfx/gl/gl_context_egl.h" |
| 11 | 11 |
| 12 // This header must come after the above third-party include, as | 12 // This header must come after the above third-party include, as |
| 13 // it brings in #defines that cause conflicts. | 13 // it brings in #defines that cause conflicts. |
| 14 #include "app/gfx/gl/gl_bindings.h" | 14 #include "ui/gfx/gl/gl_bindings.h" |
| 15 | 15 |
| 16 #if defined(OS_LINUX) | 16 #if defined(OS_LINUX) |
| 17 extern "C" { | 17 extern "C" { |
| 18 #include <X11/Xlib.h> | 18 #include <X11/Xlib.h> |
| 19 } | 19 } |
| 20 #define EGL_HAS_PBUFFERS 1 | 20 #define EGL_HAS_PBUFFERS 1 |
| 21 #endif | 21 #endif |
| 22 | 22 |
| 23 namespace gfx { | 23 namespace gfx { |
| 24 | 24 |
| (...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 419 void SecondaryEGLContext::SetSwapInterval(int interval) { | 419 void SecondaryEGLContext::SetSwapInterval(int interval) { |
| 420 DCHECK(IsCurrent()); | 420 DCHECK(IsCurrent()); |
| 421 NOTREACHED() << "Attempt to call SetSwapInterval on a SecondaryEGLContext."; | 421 NOTREACHED() << "Attempt to call SetSwapInterval on a SecondaryEGLContext."; |
| 422 } | 422 } |
| 423 | 423 |
| 424 SharedEGLSurface* SecondaryEGLContext::GetSurface() { | 424 SharedEGLSurface* SecondaryEGLContext::GetSurface() { |
| 425 return surface_; | 425 return surface_; |
| 426 } | 426 } |
| 427 | 427 |
| 428 } // namespace gfx | 428 } // namespace gfx |
| OLD | NEW |