| OLD | NEW |
|---|
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 <EGL/egl.h> | 5 #include <EGL/egl.h> |
| 6 | 6 |
| 7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
| 8 #if defined(OS_LINUX) | 8 #if defined(OS_LINUX) |
| 9 #include "app/x11_util.h" | 9 #include "app/x11_util.h" |
| 10 #define EGL_HAS_PBUFFERS 1 | 10 #define EGL_HAS_PBUFFERS 1 |
| 11 #endif | 11 #endif |
| 12 #include "base/logging.h" |
| 12 #include "base/scoped_ptr.h" | 13 #include "base/scoped_ptr.h" |
| 13 #include "app/gfx/gl/gl_bindings.h" | 14 #include "app/gfx/gl/gl_bindings.h" |
| 14 #include "app/gfx/gl/gl_context_egl.h" | 15 #include "app/gfx/gl/gl_context_egl.h" |
| 15 | 16 |
| 16 namespace gfx { | 17 namespace gfx { |
| 17 | 18 |
| 18 namespace { | 19 namespace { |
| 19 | 20 |
| 20 // The EGL configuration to use. | 21 // The EGL configuration to use. |
| 21 EGLDisplay g_display; | 22 EGLDisplay g_display; |
| (...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 283 | 284 |
| 284 void* SecondaryEGLContext::GetHandle() { | 285 void* SecondaryEGLContext::GetHandle() { |
| 285 return context_; | 286 return context_; |
| 286 } | 287 } |
| 287 | 288 |
| 288 EGLSurface SecondaryEGLContext::GetSurface() { | 289 EGLSurface SecondaryEGLContext::GetSurface() { |
| 289 return surface_; | 290 return surface_; |
| 290 } | 291 } |
| 291 | 292 |
| 292 } // namespace gfx | 293 } // namespace gfx |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 3146002:
Fixed build problems on Mac OS X when using GLContext from Chromium's... (Closed)
Base URL: svn://chrome-svn/chrome/trunk/src/