| OLD | NEW |
| 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 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 "third_party/mojo/src/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 #undef KHRONOS_APIENTRY | |
| 135 #define KHRONOS_APIENTRY | |
| 136 | |
| 137 /*------------------------------------------------------------------------- | 134 /*------------------------------------------------------------------------- |
| 138 * Definition of KHRONOS_APIATTRIBUTES | 135 * Definition of KHRONOS_APIATTRIBUTES |
| 139 *------------------------------------------------------------------------- | 136 *------------------------------------------------------------------------- |
| 140 * This follows the closing parenthesis of the function prototype arguments. | 137 * This follows the closing parenthesis of the function prototype arguments. |
| 141 */ | 138 */ |
| 142 #if defined (__ARMCC_2__) | 139 #if defined (__ARMCC_2__) |
| 143 #define KHRONOS_APIATTRIBUTES __softfp | 140 #define KHRONOS_APIATTRIBUTES __softfp |
| 144 #else | 141 #else |
| 145 #define KHRONOS_APIATTRIBUTES | 142 #define KHRONOS_APIATTRIBUTES |
| 146 #endif | 143 #endif |
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 289 * Values other than zero should be considered to be true. Therefore | 286 * Values other than zero should be considered to be true. Therefore |
| 290 * comparisons should not be made against KHRONOS_TRUE. | 287 * comparisons should not be made against KHRONOS_TRUE. |
| 291 */ | 288 */ |
| 292 typedef enum { | 289 typedef enum { |
| 293 KHRONOS_FALSE = 0, | 290 KHRONOS_FALSE = 0, |
| 294 KHRONOS_TRUE = 1, | 291 KHRONOS_TRUE = 1, |
| 295 KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM | 292 KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM |
| 296 } khronos_boolean_enum_t; | 293 } khronos_boolean_enum_t; |
| 297 | 294 |
| 298 #endif /* __khrplatform_h_ */ | 295 #endif /* __khrplatform_h_ */ |
| OLD | NEW |