diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-03-07 17:11:22 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-03-07 17:11:22 -0600 |
| commit | f0f126aa4f67264c42057ded8bd59c377a54356e (patch) | |
| tree | d6224cd652842e9bf28a83f27ba3f0bd908d8e6c /indra | |
| parent | 85fb9f5c09e20ffe8ad5f4ed45fc560507ea8305 (diff) | |
SH-1064 Fix for crash in LLVertexBuffer::setupVertexBuffer
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 7601b68c5f..1186d4d8d9 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -4204,7 +4204,7 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group) {
bump_mask |= LLVertexBuffer::MAP_BINORMAL;
}
-
+
genDrawInfo(group, simple_mask, simple_faces);
genDrawInfo(group, bump_mask, bump_faces);
genDrawInfo(group, fullbright_mask, fullbright_faces);
@@ -4423,9 +4423,10 @@ void LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, std:: }
else
{ //resize pre-existing buffer
- if (LLVertexBuffer::sEnableVBOs && buffer->getUsage() != group->mBufferUsage)
+ if (LLVertexBuffer::sEnableVBOs && buffer->getUsage() != group->mBufferUsage ||
+ buffer->getTypeMask() != mask)
{
- buffer = createVertexBuffer(group->mSpatialPartition->mVertexDataMask,
+ buffer = createVertexBuffer(mask,
group->mBufferUsage);
buffer->allocateBuffer(geom_count, index_count, TRUE);
}
|