| 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 20 matching lines...) Expand all Loading... |
| 31 | 31 |
| 32 | 32 |
| 33 // This file implements the command-buffer version of the Effect class. | 33 // This file implements the command-buffer version of the Effect class. |
| 34 | 34 |
| 35 #include "core/cross/precompile.h" | 35 #include "core/cross/precompile.h" |
| 36 #include "core/cross/error.h" | 36 #include "core/cross/error.h" |
| 37 #include "core/cross/semantic_manager.h" | 37 #include "core/cross/semantic_manager.h" |
| 38 #include "core/cross/service_locator.h" | 38 #include "core/cross/service_locator.h" |
| 39 #include "core/cross/command_buffer/effect_cb.h" | 39 #include "core/cross/command_buffer/effect_cb.h" |
| 40 #include "command_buffer/common/cross/constants.h" | 40 #include "command_buffer/common/cross/constants.h" |
| 41 #include "command_buffer/common/cross/cmd_buffer_format.h" | 41 #include "command_buffer/common/cross/o3d_cmd_format.h" |
| 42 #include "command_buffer/client/cross/fenced_allocator.h" | 42 #include "command_buffer/client/cross/fenced_allocator.h" |
| 43 #include "command_buffer/client/cross/o3d_cmd_helper.h" | 43 #include "command_buffer/client/cross/o3d_cmd_helper.h" |
| 44 | 44 |
| 45 namespace o3d { | 45 namespace o3d { |
| 46 | 46 |
| 47 using command_buffer::CommandBufferEntry; | 47 using command_buffer::CommandBufferEntry; |
| 48 using command_buffer::O3DCmdHelper; | 48 using command_buffer::O3DCmdHelper; |
| 49 using command_buffer::ResourceId; | 49 using command_buffer::ResourceId; |
| 50 namespace effect_param = command_buffer::effect_param; | 50 namespace effect_param = command_buffer::effect_param; |
| 51 namespace parse_error = command_buffer::parse_error; | 51 namespace parse_error = command_buffer::parse_error; |
| (...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 250 if (CBSemanticToO3DSemantic(stream_descs_[i].semantic, | 250 if (CBSemanticToO3DSemantic(stream_descs_[i].semantic, |
| 251 stream_descs_[i].semantic_index, | 251 stream_descs_[i].semantic_index, |
| 252 &semantic, | 252 &semantic, |
| 253 &semantic_index)) { | 253 &semantic_index)) { |
| 254 array->push_back(EffectStreamInfo(semantic, semantic_index)); | 254 array->push_back(EffectStreamInfo(semantic, semantic_index)); |
| 255 } | 255 } |
| 256 } | 256 } |
| 257 } | 257 } |
| 258 | 258 |
| 259 } // namespace o3d | 259 } // namespace o3d |
| OLD | NEW |