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

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

Issue 1545113002: Switch to standard integer types in ui/gl/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 | « ui/gl/gl_api_unittest.cc ('k') | ui/gl/gl_bindings.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) 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 #include <stdint.h>
9
8 #include <string> 10 #include <string>
9 11
10 // Includes the platform independent and platform dependent GL headers. 12 // Includes the platform independent and platform dependent GL headers.
11 // Only include this in cc files. It pulls in system headers, including 13 // Only include this in cc files. It pulls in system headers, including
12 // the X11 headers on linux, which define all kinds of macros that are 14 // the X11 headers on linux, which define all kinds of macros that are
13 // liable to cause conflicts. 15 // liable to cause conflicts.
14 16
15 #include <GL/gl.h> 17 #include <GL/gl.h>
16 #include <GL/glext.h> 18 #include <GL/glext.h>
17 #include <EGL/egl.h> 19 #include <EGL/egl.h>
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
362 #define GL_SERVICE_LOG_CODE_BLOCK(code) 364 #define GL_SERVICE_LOG_CODE_BLOCK(code)
363 #else 365 #else
364 #define GL_SERVICE_LOG_CODE_BLOCK(code) code 366 #define GL_SERVICE_LOG_CODE_BLOCK(code) code
365 #endif 367 #endif
366 368
367 // Forward declare OSMesa types. 369 // Forward declare OSMesa types.
368 typedef struct osmesa_context *OSMesaContext; 370 typedef struct osmesa_context *OSMesaContext;
369 typedef void (*OSMESAproc)(); 371 typedef void (*OSMESAproc)();
370 372
371 // Forward declare EGL types. 373 // Forward declare EGL types.
372 typedef uint64 EGLuint64CHROMIUM; 374 typedef uint64_t EGLuint64CHROMIUM;
373 375
374 #include "gl_bindings_autogen_gl.h" 376 #include "gl_bindings_autogen_gl.h"
375 #include "gl_bindings_autogen_osmesa.h" 377 #include "gl_bindings_autogen_osmesa.h"
376 378
377 #if defined(OS_WIN) 379 #if defined(OS_WIN)
378 #include "gl_bindings_autogen_egl.h" 380 #include "gl_bindings_autogen_egl.h"
379 #include "gl_bindings_autogen_wgl.h" 381 #include "gl_bindings_autogen_wgl.h"
380 #elif defined(USE_X11) 382 #elif defined(USE_X11)
381 #include "gl_bindings_autogen_egl.h" 383 #include "gl_bindings_autogen_egl.h"
382 #include "gl_bindings_autogen_glx.h" 384 #include "gl_bindings_autogen_glx.h"
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
500 #elif defined(OS_ANDROID) 502 #elif defined(OS_ANDROID)
501 503
502 GL_EXPORT extern EGLApi* g_current_egl_context; 504 GL_EXPORT extern EGLApi* g_current_egl_context;
503 GL_EXPORT extern DriverEGL g_driver_egl; 505 GL_EXPORT extern DriverEGL g_driver_egl;
504 506
505 #endif 507 #endif
506 508
507 } // namespace gfx 509 } // namespace gfx
508 510
509 #endif // UI_GL_GL_BINDINGS_H_ 511 #endif // UI_GL_GL_BINDINGS_H_
OLDNEW
« no previous file with comments | « ui/gl/gl_api_unittest.cc ('k') | ui/gl/gl_bindings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698