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

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

Issue 7659015: Revert 96982 - Add gl.dll, compositor.dll, and surface.dll. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 4 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/gfx/gl/gl.gyp ('k') | ui/gfx/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) 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 // 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 UI_GFX_GL_GL_BINDINGS_H_ 10 #ifndef UI_GFX_GL_GL_BINDINGS_H_
11 #define UI_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 #include "base/logging.h" 18 #include "base/logging.h"
19 #include "ui/gfx/gl/gl_export.h"
20 19
21 // The standard OpenGL native extension headers are also included. 20 // The standard OpenGL native extension headers are also included.
22 #if defined(OS_WIN) 21 #if defined(OS_WIN)
23 #include <GL/wglext.h> 22 #include <GL/wglext.h>
24 #elif defined(OS_MACOSX) 23 #elif defined(OS_MACOSX)
25 #include <OpenGL/OpenGL.h> 24 #include <OpenGL/OpenGL.h>
26 #elif defined(USE_X11) 25 #elif defined(USE_X11)
27 #include <GL/glx.h> 26 #include <GL/glx.h>
28 #include <GL/glxext.h> 27 #include <GL/glxext.h>
29 28
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 #endif 88 #endif
90 89
91 namespace gfx { 90 namespace gfx {
92 91
93 // Find an entry point to the mock GL implementation. 92 // Find an entry point to the mock GL implementation.
94 void* GL_BINDING_CALL GetMockGLProcAddress(const char* name); 93 void* GL_BINDING_CALL GetMockGLProcAddress(const char* name);
95 94
96 } // namespace gfx 95 } // namespace gfx
97 96
98 #endif // UI_GFX_GL_GL_BINDINGS_H_ 97 #endif // UI_GFX_GL_GL_BINDINGS_H_
OLDNEW
« no previous file with comments | « ui/gfx/gl/gl.gyp ('k') | ui/gfx/gl/gl_bindings_skia_in_process.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698