| OLD | NEW |
| 1 // Copyright (c) 2010 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 // Includes the platform independent and platform dependent GL headers. | 5 // Includes the platform independent and platform dependent GL headers. |
| 6 // Only include this in cc files. It pulls in system headers, including | 6 // Only include this in cc files. It pulls in system headers, including |
| 7 // the X11 headers on linux, which define all kinds of macros that are | 7 // the X11 headers on linux, which define all kinds of macros that are |
| 8 // liable to cause conflicts. | 8 // liable to cause conflicts. |
| 9 | 9 |
| 10 #ifndef APP_GFX_GL_GL_BINDINGS_H_ | 10 #ifndef UI_GFX_GL_GL_BINDINGS_H_ |
| 11 #define APP_GFX_GL_GL_BINDINGS_H_ | 11 #define UI_GFX_GL_GL_BINDINGS_H_ |
| 12 #pragma once | 12 #pragma once |
| 13 | 13 |
| 14 #include <GL/gl.h> | 14 #include <GL/gl.h> |
| 15 #include <GL/glext.h> | 15 #include <GL/glext.h> |
| 16 | 16 |
| 17 #include "build/build_config.h" | 17 #include "build/build_config.h" |
| 18 #if defined(OS_WIN) | 18 #if defined(OS_WIN) |
| 19 #include "base/logging.h" | 19 #include "base/logging.h" |
| 20 #endif | 20 #endif |
| 21 | 21 |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 88 #include "gl_bindings_autogen_glx.h" | 88 #include "gl_bindings_autogen_glx.h" |
| 89 #endif | 89 #endif |
| 90 | 90 |
| 91 namespace gfx { | 91 namespace gfx { |
| 92 | 92 |
| 93 // Find an entry point to the mock GL implementation. | 93 // Find an entry point to the mock GL implementation. |
| 94 void* GL_BINDING_CALL GetMockGLProcAddress(const char* name); | 94 void* GL_BINDING_CALL GetMockGLProcAddress(const char* name); |
| 95 | 95 |
| 96 } // namespace gfx | 96 } // namespace gfx |
| 97 | 97 |
| 98 #endif // APP_GFX_GL_GL_BINDINGS_H_ | 98 #endif // UI_GFX_GL_GL_BINDINGS_H_ |
| OLD | NEW |