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

Side by Side Diff: third_party/khronos/KHR/khrplatform.h

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 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
« no previous file with comments | « third_party/khronos/DEPS ('k') | third_party/mojo/mojo_edk_tests.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 #else 117 #else
118 # define KHRONOS_APIENTRY 118 # define KHRONOS_APIENTRY
119 #endif 119 #endif
120 120
121 /*------------------------------------------------------------------------- 121 /*-------------------------------------------------------------------------
122 * Chromium-specific overrides of KHRONOS_APICALL and KHRONOS_APIENTRY 122 * Chromium-specific overrides of KHRONOS_APICALL and KHRONOS_APIENTRY
123 *-----------------------------------------------------------------------*/ 123 *-----------------------------------------------------------------------*/
124 124
125 #undef KHRONOS_APICALL 125 #undef KHRONOS_APICALL
126 #if defined(GLES2_USE_MOJO) 126 #if defined(GLES2_USE_MOJO)
127 #include "third_party/mojo/src/mojo/public/c/gles2/gles2_export.h" 127 #include "mojo/public/c/gles2/gles2_export.h"
128 #define KHRONOS_APICALL MOJO_GLES2_EXPORT 128 #define KHRONOS_APICALL MOJO_GLES2_EXPORT
129 #else 129 #else
130 #include "gpu/command_buffer/client/gles2_c_lib_export.h" 130 #include "gpu/command_buffer/client/gles2_c_lib_export.h"
131 #define KHRONOS_APICALL GLES2_C_LIB_EXPORT 131 #define KHRONOS_APICALL GLES2_C_LIB_EXPORT
132 #endif 132 #endif
133 133
134 /*------------------------------------------------------------------------- 134 /*-------------------------------------------------------------------------
135 * Definition of KHRONOS_APIATTRIBUTES 135 * Definition of KHRONOS_APIATTRIBUTES
136 *------------------------------------------------------------------------- 136 *-------------------------------------------------------------------------
137 * This follows the closing parenthesis of the function prototype arguments. 137 * This follows the closing parenthesis of the function prototype arguments.
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 * Values other than zero should be considered to be true. Therefore 286 * Values other than zero should be considered to be true. Therefore
287 * comparisons should not be made against KHRONOS_TRUE. 287 * comparisons should not be made against KHRONOS_TRUE.
288 */ 288 */
289 typedef enum { 289 typedef enum {
290 KHRONOS_FALSE = 0, 290 KHRONOS_FALSE = 0,
291 KHRONOS_TRUE = 1, 291 KHRONOS_TRUE = 1,
292 KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM 292 KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM
293 } khronos_boolean_enum_t; 293 } khronos_boolean_enum_t;
294 294
295 #endif /* __khrplatform_h_ */ 295 #endif /* __khrplatform_h_ */
OLDNEW
« no previous file with comments | « third_party/khronos/DEPS ('k') | third_party/mojo/mojo_edk_tests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698