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

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

Issue 1936093003: Fix gpu_video_decode_accelerator include order by renaming enum with X11 name collision (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move misplaced #endif to preserve #undefs across platforms Created 4 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
« no previous file with comments | « media/gpu/ipc/service/gpu_video_decode_accelerator.cc ('k') | no next file » | 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_ 5 #ifndef UI_GL_GL_BINDINGS_H_
6 #define UI_GL_GL_BINDINGS_H_ 6 #define UI_GL_GL_BINDINGS_H_
7 7
8 // Includes the platform independent and platform dependent GL headers. 8 // Includes the platform independent and platform dependent GL headers.
9 // Only include this in cc files. It pulls in system headers, including 9 // Only include this in cc files. It pulls in system headers, including
10 // the X11 headers on linux, which define all kinds of macros that are 10 // the X11 headers on linux, which define all kinds of macros that are
(...skipping 21 matching lines...) Expand all
32 #include "ui/gl/gl_export.h" 32 #include "ui/gl/gl_export.h"
33 33
34 // The standard OpenGL native extension headers are also included. 34 // The standard OpenGL native extension headers are also included.
35 #if defined(OS_WIN) 35 #if defined(OS_WIN)
36 #include <GL/wglext.h> 36 #include <GL/wglext.h>
37 #elif defined(OS_MACOSX) 37 #elif defined(OS_MACOSX)
38 #include <OpenGL/OpenGL.h> 38 #include <OpenGL/OpenGL.h>
39 #elif defined(USE_GLX) 39 #elif defined(USE_GLX)
40 #include <GL/glx.h> 40 #include <GL/glx.h>
41 #include <GL/glxext.h> 41 #include <GL/glxext.h>
42 #endif
42 43
43 // Undefine some macros defined by X headers. This is why this file should only 44 // Undefine some macros defined by X headers. This is why this file should only
44 // be included in .cc files. 45 // be included in .cc files.
45 #undef Bool 46 #undef Bool
46 #undef None 47 #undef None
47 #undef Status 48 #undef Status
48 #endif
49 49
50 50
51 // GLES2 defines not part of Desktop GL 51 // GLES2 defines not part of Desktop GL
52 // Shader Precision-Specified Types 52 // Shader Precision-Specified Types
53 #define GL_LOW_FLOAT 0x8DF0 53 #define GL_LOW_FLOAT 0x8DF0
54 #define GL_MEDIUM_FLOAT 0x8DF1 54 #define GL_MEDIUM_FLOAT 0x8DF1
55 #define GL_HIGH_FLOAT 0x8DF2 55 #define GL_HIGH_FLOAT 0x8DF2
56 #define GL_LOW_INT 0x8DF3 56 #define GL_LOW_INT 0x8DF3
57 #define GL_MEDIUM_INT 0x8DF4 57 #define GL_MEDIUM_INT 0x8DF4
58 #define GL_HIGH_INT 0x8DF5 58 #define GL_HIGH_INT 0x8DF5
(...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after
495 #endif 495 #endif
496 496
497 #if defined(USE_GLX) 497 #if defined(USE_GLX)
498 GL_EXPORT extern GLXApi* g_current_glx_context; 498 GL_EXPORT extern GLXApi* g_current_glx_context;
499 GL_EXPORT extern DriverGLX g_driver_glx; 499 GL_EXPORT extern DriverGLX g_driver_glx;
500 #endif 500 #endif
501 501
502 } // namespace gfx 502 } // namespace gfx
503 503
504 #endif // UI_GL_GL_BINDINGS_H_ 504 #endif // UI_GL_GL_BINDINGS_H_
OLDNEW
« no previous file with comments | « media/gpu/ipc/service/gpu_video_decode_accelerator.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698