Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1521)

Side by Side Diff: ui/gl/gl_bindings.h

Issue 10392068: ui: Move gl/ directory out of gfx/, up to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix mac_rel Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/gl/gl.gyp ('k') | ui/gl/gl_bindings_skia_in_process.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #ifndef UI_GL_GL_BINDINGS_H_
6 #define UI_GL_GL_BINDINGS_H_
7 #pragma once
8
5 // Includes the platform independent and platform dependent GL headers. 9 // Includes the platform independent and platform dependent GL headers.
6 // Only include this in cc files. It pulls in system headers, including 10 // 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 11 // the X11 headers on linux, which define all kinds of macros that are
8 // liable to cause conflicts. 12 // liable to cause conflicts.
9 13
10 #ifndef UI_GFX_GL_GL_BINDINGS_H_
11 #define UI_GFX_GL_GL_BINDINGS_H_
12 #pragma once
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 "base/logging.h"
17 #include "build/build_config.h" 18 #include "build/build_config.h"
18 #include "base/logging.h" 19 #include "ui/gl/gl_export.h"
19 #include "ui/gfx/gl/gl_export.h"
20 20
21 // The standard OpenGL native extension headers are also included. 21 // The standard OpenGL native extension headers are also included.
22 #if defined(OS_WIN) 22 #if defined(OS_WIN)
23 #include <GL/wglext.h> 23 #include <GL/wglext.h>
24 #elif defined(OS_MACOSX) 24 #elif defined(OS_MACOSX)
25 #include <OpenGL/OpenGL.h> 25 #include <OpenGL/OpenGL.h>
26 #elif defined(USE_X11) 26 #elif defined(USE_X11)
27 #include <GL/glx.h> 27 #include <GL/glx.h>
28 #include <GL/glxext.h> 28 #include <GL/glxext.h>
29 29
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 #include "gl_bindings_autogen_egl.h" 95 #include "gl_bindings_autogen_egl.h"
96 #endif 96 #endif
97 97
98 namespace gfx { 98 namespace gfx {
99 99
100 // Find an entry point to the mock GL implementation. 100 // Find an entry point to the mock GL implementation.
101 void* GL_BINDING_CALL GetMockGLProcAddress(const char* name); 101 void* GL_BINDING_CALL GetMockGLProcAddress(const char* name);
102 102
103 } // namespace gfx 103 } // namespace gfx
104 104
105 #endif // UI_GFX_GL_GL_BINDINGS_H_ 105 #endif // UI_GL_GL_BINDINGS_H_
OLDNEW
« no previous file with comments | « ui/gl/gl.gyp ('k') | ui/gl/gl_bindings_skia_in_process.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698