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

Side by Side Diff: gpu/KHR/khrplatform.h

Issue 8633020: Revert 111170 - Move GL headers from gpu to third_party/khronos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 1 month 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 | « gpu/GLES2/gl2platform.h ('k') | gpu/gles2_conform_support/egl/native/EGL/egl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
OLDNEW
1 #ifndef __khrplatform_h_ 1 #ifndef __khrplatform_h_
2 #define __khrplatform_h_ 2 #define __khrplatform_h_
3 3
4 /* 4 /*
5 ** Copyright (c) 2008-2009 The Khronos Group Inc. 5 ** Copyright (c) 2008-2009 The Khronos Group Inc.
6 ** 6 **
7 ** Permission is hereby granted, free of charge, to any person obtaining a 7 ** Permission is hereby granted, free of charge, to any person obtaining a
8 ** copy of this software and/or associated documentation files (the 8 ** copy of this software and/or associated documentation files (the
9 ** "Materials"), to deal in the Materials without restriction, including 9 ** "Materials"), to deal in the Materials without restriction, including
10 ** without limitation the rights to use, copy, modify, merge, publish, 10 ** without limitation the rights to use, copy, modify, merge, publish,
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 * Values other than zero should be considered to be true. Therefore 260 * Values other than zero should be considered to be true. Therefore
261 * comparisons should not be made against KHRONOS_TRUE. 261 * comparisons should not be made against KHRONOS_TRUE.
262 */ 262 */
263 typedef enum { 263 typedef enum {
264 KHRONOS_FALSE = 0, 264 KHRONOS_FALSE = 0,
265 KHRONOS_TRUE = 1, 265 KHRONOS_TRUE = 1,
266 KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM 266 KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM
267 } khronos_boolean_enum_t; 267 } khronos_boolean_enum_t;
268 268
269 #endif /* __khrplatform_h_ */ 269 #endif /* __khrplatform_h_ */
OLDNEW
« no previous file with comments | « gpu/GLES2/gl2platform.h ('k') | gpu/gles2_conform_support/egl/native/EGL/egl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698