diff options
Diffstat (limited to 'o3d/core/cross/buffer.cc')
| -rw-r--r-- | o3d/core/cross/buffer.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/o3d/core/cross/buffer.cc b/o3d/core/cross/buffer.cc index acb6b31..d467d987 100644 --- a/o3d/core/cross/buffer.cc +++ b/o3d/core/cross/buffer.cc @@ -199,7 +199,6 @@ bool Buffer::ReshuffleBuffer(unsigned int new_stride, Field* field_to_remove) { } } } - // Copy the reorganized data into a new buffer. { ConcreteFree(); @@ -210,7 +209,11 @@ bool Buffer::ReshuffleBuffer(unsigned int new_stride, Field* field_to_remove) { << " for Buffer '" << name() << "'"; return false; } - + // stride_ must be set before GetData is called so that the proper size + // buffer is allocated. We also need to set it after this function is + // is completed (see CreateField, RemoveField) for when we create a new + // buffer with no fields yet. + stride_ = new_stride; BufferLockHelper helper(this); void* destination = helper.GetData(Buffer::WRITE_ONLY); if (!destination) { |