| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2009, Google Inc. | 2 * Copyright 2009, Google Inc. |
| 3 * All rights reserved. | 3 * All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
| 7 * met: | 7 * met: |
| 8 * | 8 * |
| 9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | 22 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
| 23 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 23 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
| 24 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 24 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 30 */ | 30 */ |
| 31 | 31 |
| 32 | |
| 33 // This file contains cross-platform basic type definitions | 32 // This file contains cross-platform basic type definitions |
| 34 | 33 |
| 35 #ifndef GPU_COMMAND_BUFFER_COMMON_CROSS_TYPES_H_ | 34 #ifndef GPU_COMMAND_BUFFER_COMMON_TYPES_H_ |
| 36 #define GPU_COMMAND_BUFFER_COMMON_CROSS_TYPES_H_ | 35 #define GPU_COMMAND_BUFFER_COMMON_TYPES_H_ |
| 37 | 36 |
| 38 #include <build/build_config.h> | 37 #include <build/build_config.h> |
| 39 #if !defined(COMPILER_MSVC) | 38 #if !defined(COMPILER_MSVC) |
| 40 #include <stdint.h> | 39 #include <stdint.h> |
| 41 #endif | 40 #endif |
| 42 #include <string> | 41 #include <string> |
| 43 | 42 |
| 44 namespace command_buffer { | 43 namespace gpu { |
| 45 #if defined(COMPILER_MSVC) | 44 #if defined(COMPILER_MSVC) |
| 46 typedef short Int16; | 45 typedef short Int16; |
| 47 typedef unsigned short Uint16; | 46 typedef unsigned short Uint16; |
| 48 typedef int Int32; | 47 typedef int Int32; |
| 49 typedef unsigned int Uint32; | 48 typedef unsigned int Uint32; |
| 50 #else | 49 #else |
| 51 typedef int16_t Int16; | 50 typedef int16_t Int16; |
| 52 typedef uint16_t Uint16; | 51 typedef uint16_t Uint16; |
| 53 typedef int32_t Int32; | 52 typedef int32_t Int32; |
| 54 typedef uint32_t Uint32; | 53 typedef uint32_t Uint32; |
| 55 #endif | 54 #endif |
| 56 | 55 |
| 57 typedef std::string String; | 56 typedef std::string String; |
| 58 } // namespace command_buffer | 57 } // namespace gpu |
| 59 | 58 |
| 60 #endif // GPU_COMMAND_BUFFER_COMMON_CROSS_TYPES_H_ | 59 #endif // GPU_COMMAND_BUFFER_COMMON_TYPES_H_ |
| OLD | NEW |