| 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 28 matching lines...) Expand all Loading... |
| 39 #include <algorithm> | 39 #include <algorithm> |
| 40 #include "base/basictypes.h" | 40 #include "base/basictypes.h" |
| 41 #include "base/scoped_ptr.h" | 41 #include "base/scoped_ptr.h" |
| 42 #include "command_buffer/common/cross/types.h" | 42 #include "command_buffer/common/cross/types.h" |
| 43 #include "command_buffer/common/cross/logging.h" | 43 #include "command_buffer/common/cross/logging.h" |
| 44 | 44 |
| 45 namespace o3d { | 45 namespace o3d { |
| 46 namespace command_buffer { | 46 namespace command_buffer { |
| 47 | 47 |
| 48 // A resource ID, key to the resource maps. | 48 // A resource ID, key to the resource maps. |
| 49 // TODO(gman): Shouldn't this be a uint32? |
| 49 typedef unsigned int ResourceID; | 50 typedef unsigned int ResourceID; |
| 50 // Invalid resource ID. | 51 // Invalid resource ID. |
| 51 static const ResourceID kInvalidResource = 0xffffffffU; | 52 static const ResourceID kInvalidResource = 0xffffffffU; |
| 52 | 53 |
| 53 namespace vertex_buffer { | 54 namespace vertex_buffer { |
| 54 // Vertex buffer flags. | 55 // Vertex buffer flags. |
| 55 enum Flags { | 56 enum Flags { |
| 56 DYNAMIC = 0x01, // This vertex buffer is dynamic and is expected to have | 57 DYNAMIC = 0x01, // This vertex buffer is dynamic and is expected to have |
| 57 // its data updated often. | 58 // its data updated often. |
| 58 }; | 59 }; |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 216 POINT, | 217 POINT, |
| 217 LINEAR, | 218 LINEAR, |
| 218 NUM_FILTERING_MODE | 219 NUM_FILTERING_MODE |
| 219 }; | 220 }; |
| 220 } // namespace sampler | 221 } // namespace sampler |
| 221 | 222 |
| 222 } // namespace command_buffer | 223 } // namespace command_buffer |
| 223 } // namespace o3d | 224 } // namespace o3d |
| 224 | 225 |
| 225 #endif // O3D_COMMAND_BUFFER_COMMON_CROSS_RESOURCE_H_ | 226 #endif // O3D_COMMAND_BUFFER_COMMON_CROSS_RESOURCE_H_ |
| OLD | NEW |