| 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 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 : data_type_(data_type) { | 146 : data_type_(data_type) { |
| 147 } | 147 } |
| 148 | 148 |
| 149 // Gets the data type of this parameter. | 149 // Gets the data type of this parameter. |
| 150 effect_param::DataType data_type() const { return data_type_; } | 150 effect_param::DataType data_type() const { return data_type_; } |
| 151 private: | 151 private: |
| 152 effect_param::DataType data_type_; | 152 effect_param::DataType data_type_; |
| 153 DISALLOW_COPY_AND_ASSIGN(EffectParam); | 153 DISALLOW_COPY_AND_ASSIGN(EffectParam); |
| 154 }; | 154 }; |
| 155 | 155 |
| 156 class EffectStream: public Resource { | |
| 157 public: | |
| 158 explicit EffectStream() {} | |
| 159 private: | |
| 160 DISALLOW_COPY_AND_ASSIGN(EffectStream); | |
| 161 }; | |
| 162 | |
| 163 // Texture class, representing a texture resource. | 156 // Texture class, representing a texture resource. |
| 164 class Texture: public Resource { | 157 class Texture: public Resource { |
| 165 public: | 158 public: |
| 166 Texture(texture::Type type, | 159 Texture(texture::Type type, |
| 167 unsigned int levels, | 160 unsigned int levels, |
| 168 texture::Format format, | 161 texture::Format format, |
| 169 unsigned int flags) | 162 unsigned int flags) |
| 170 : type_(type), | 163 : type_(type), |
| 171 levels_(levels), | 164 levels_(levels), |
| 172 format_(format), | 165 format_(format), |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 247 return down_cast<T*>(container_.Get(id)); | 240 return down_cast<T*>(container_.Get(id)); |
| 248 } | 241 } |
| 249 private: | 242 private: |
| 250 ResourceMapBase container_; | 243 ResourceMapBase container_; |
| 251 }; | 244 }; |
| 252 | 245 |
| 253 } // namespace command_buffer | 246 } // namespace command_buffer |
| 254 } // namespace o3d | 247 } // namespace o3d |
| 255 | 248 |
| 256 #endif // O3D_COMMAND_BUFFER_SERVICE_CROSS_RESOURCE_H__ | 249 #endif // O3D_COMMAND_BUFFER_SERVICE_CROSS_RESOURCE_H__ |
| OLD | NEW |