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 21 matching lines...) Expand all Loading... | |
32 | 32 |
33 // This file contains the binary format definition of the command buffer and | 33 // This file contains the binary format definition of the command buffer and |
34 // command buffer commands. | 34 // command buffer commands. |
35 | 35 |
36 #include "command_buffer/common/cross/o3d_cmd_format.h" | 36 #include "command_buffer/common/cross/o3d_cmd_format.h" |
37 | 37 |
38 namespace o3d { | 38 namespace o3d { |
39 namespace command_buffer { | 39 namespace command_buffer { |
40 namespace o3d { | 40 namespace o3d { |
41 | 41 |
42 const char* GetCommandName(CommandId id) { | 42 const char* GetCommandName(CommandId command_id) { |
43 static const char* const names[] = { | 43 static const char* const names[] = { |
44 | 44 |
45 #define O3D_COMMAND_BUFFER_CMD_OP(name) # name, | 45 #define O3D_COMMAND_BUFFER_CMD_OP(name) # name, |
46 | 46 |
47 O3D_COMMAND_BUFFER_CMDS(O3D_COMMAND_BUFFER_CMD_OP) | 47 O3D_COMMAND_BUFFER_CMDS(O3D_COMMAND_BUFFER_CMD_OP) |
48 | 48 |
49 #undef O3D_COMMAND_BUFFER_CMD_OP | 49 #undef O3D_COMMAND_BUFFER_CMD_OP |
50 | 50 |
51 }; | 51 }; |
52 | 52 |
53 return (static_cast<int>(id) >= 0 && static_cast<int>(id) < kNumCommands) ? | 53 int id = static_cast<int>(command_id); |
54 names[id] : "*unknown-command*"; | 54 return (static_cast<int>(id) > kStartPoint && |
apatrick
2009/10/28 16:44:01
no need for static_casts.
| |
55 static_cast<int>(id) < kNumCommands) ? | |
56 names[id - kStartPoint - 1] : "*unknown-command*"; | |
55 } | 57 } |
56 | 58 |
57 } // namespace cmd | 59 } // namespace cmd |
58 } // namespace command_buffer | 60 } // namespace command_buffer |
59 } // namespace o3d | 61 } // namespace o3d |
60 | 62 |
61 | 63 |
OLD | NEW |