From 85fb9f5c09e20ffe8ad5f4ed45fc560507ea8305 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Mon, 7 Mar 2011 17:10:10 -0600 Subject: Fix for crash when enabling Debug GL and rendering deferred impostors. --- indra/newview/lldrawpoolavatar.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp index 48e561b24b..2de4c93ffd 100644 --- a/indra/newview/lldrawpoolavatar.cpp +++ b/indra/newview/lldrawpoolavatar.cpp @@ -334,7 +334,14 @@ void LLDrawPoolAvatar::renderPostDeferred(S32 pass) 9, //rigged glow }; - render(actual_pass[pass]); + pass = actual_pass[pass]; + + if (LLPipeline::sImpostorRender) + { //HACK for impostors so actual pass ends up being proper pass + pass -= 2; + } + + render(pass); } -- cgit v1.2.3 From f0f126aa4f67264c42057ded8bd59c377a54356e Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Mon, 7 Mar 2011 17:11:22 -0600 Subject: SH-1064 Fix for crash in LLVertexBuffer::setupVertexBuffer --- indra/newview/llvovolume.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'indra/newview') 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); } -- cgit v1.2.3