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

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

Issue 7467007: Adding Wayland support for ui/gfx (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Adding missing WaylandDisplay include 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_context_linux.cc » ('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_
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 typedef void *EGLImageKHR; 57 typedef void *EGLImageKHR;
58 typedef void *EGLSurface; 58 typedef void *EGLSurface;
59 typedef void *EGLClientBuffer; 59 typedef void *EGLClientBuffer;
60 typedef void (*__eglMustCastToProperFunctionPointerType)(void); 60 typedef void (*__eglMustCastToProperFunctionPointerType)(void);
61 typedef void* GLeglImageOES; 61 typedef void* GLeglImageOES;
62 62
63 #if defined(OS_WIN) 63 #if defined(OS_WIN)
64 typedef HDC EGLNativeDisplayType; 64 typedef HDC EGLNativeDisplayType;
65 typedef HBITMAP EGLNativePixmapType; 65 typedef HBITMAP EGLNativePixmapType;
66 typedef HWND EGLNativeWindowType; 66 typedef HWND EGLNativeWindowType;
67 #elif defined(USE_WAYLAND)
68 typedef struct wl_display *EGLNativeDisplayType;
69 typedef struct wl_egl_pixmap *EGLNativePixmapType;
70 typedef struct wl_egl_window *EGLNativeWindowType;
67 #else 71 #else
68 typedef Display *EGLNativeDisplayType; 72 typedef Display *EGLNativeDisplayType;
69 typedef Pixmap EGLNativePixmapType; 73 typedef Pixmap EGLNativePixmapType;
70 typedef Window EGLNativeWindowType; 74 typedef Window EGLNativeWindowType;
71 #endif 75 #endif
72 76
73 #endif // !OS_MACOSX 77 #endif // !OS_MACOSX
74 78
75 #include "gl_bindings_autogen_gl.h" 79 #include "gl_bindings_autogen_gl.h"
76 #include "gl_bindings_autogen_osmesa.h" 80 #include "gl_bindings_autogen_osmesa.h"
77 81
78 #if defined(OS_WIN) 82 #if defined(OS_WIN)
79 #include "gl_bindings_autogen_egl.h" 83 #include "gl_bindings_autogen_egl.h"
80 #include "gl_bindings_autogen_wgl.h" 84 #include "gl_bindings_autogen_wgl.h"
81 #elif defined(USE_X11) 85 #elif defined(USE_X11)
82 #include "gl_bindings_autogen_egl.h" 86 #include "gl_bindings_autogen_egl.h"
83 #include "gl_bindings_autogen_glx.h" 87 #include "gl_bindings_autogen_glx.h"
84 #endif 88 #endif
85 89
86 namespace gfx { 90 namespace gfx {
87 91
88 // Find an entry point to the mock GL implementation. 92 // Find an entry point to the mock GL implementation.
89 void* GL_BINDING_CALL GetMockGLProcAddress(const char* name); 93 void* GL_BINDING_CALL GetMockGLProcAddress(const char* name);
90 94
91 } // namespace gfx 95 } // namespace gfx
92 96
93 #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_context_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698