diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-05-23 11:11:14 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-05-23 11:11:14 -0500 |
| commit | cea270c50aee7651c1746177f1121e8d25eb8569 (patch) | |
| tree | aa197c3e2b45c82eefd0e1efe1fbb8eb85637c94 | |
| parent | 42cdb4a4b29535b8580a7e532eb5262080239d28 (diff) | |
MAINT-616 Fix for particles not rendering.
| -rw-r--r-- | indra/newview/lldrawpoolalpha.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llvopartgroup.cpp | 9 | ||||
| -rw-r--r-- | indra/newview/llvopartgroup.h | 9 |
3 files changed, 15 insertions, 5 deletions
diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp index a56e71baa8..5f2a982ed3 100644 --- a/indra/newview/lldrawpoolalpha.cpp +++ b/indra/newview/lldrawpoolalpha.cpp @@ -407,7 +407,7 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask) if ((params.mVertexBuffer->getTypeMask() & mask) != mask) { //FIXME! - //llwarns << "Missing required components, skipping render batch." << llendl; + llwarns << "Missing required components, skipping render batch." << llendl; continue; } diff --git a/indra/newview/llvopartgroup.cpp b/indra/newview/llvopartgroup.cpp index fca97987a2..1ac13cd1ea 100644 --- a/indra/newview/llvopartgroup.cpp +++ b/indra/newview/llvopartgroup.cpp @@ -69,8 +69,15 @@ void LLVOPartGroup::restoreGL() //indices and texcoords are always the same, set once LLStrider<U16> indicesp; + LLStrider<LLVector4a> verticesp; + sVB->getIndexStrider(indicesp); + sVB->getVertexStrider(verticesp); + + LLVector4a v; + v.set(0,0,0,0); + U16 vert_offset = 0; for (U32 i = 0; i < LL_MAX_PARTICLE_COUNT; i++) @@ -83,6 +90,8 @@ void LLVOPartGroup::restoreGL() *indicesp++ = vert_offset + 3; *indicesp++ = vert_offset + 2; + *verticesp++ = v; + vert_offset += 4; } diff --git a/indra/newview/llvopartgroup.h b/indra/newview/llvopartgroup.h index dde0b0476d..6160bceb24 100644 --- a/indra/newview/llvopartgroup.h +++ b/indra/newview/llvopartgroup.h @@ -52,10 +52,11 @@ public: enum { - VERTEX_DATA_MASK = (1 << LLVertexBuffer::TYPE_VERTEX) | - (1 << LLVertexBuffer::TYPE_NORMAL) | - (1 << LLVertexBuffer::TYPE_TEXCOORD0) | - (1 << LLVertexBuffer::TYPE_COLOR) + VERTEX_DATA_MASK = LLVertexBuffer::MAP_VERTEX | + LLVertexBuffer::MAP_NORMAL | + LLVertexBuffer::MAP_TEXCOORD0 | + LLVertexBuffer::MAP_COLOR | + LLVertexBuffer::MAP_TEXTURE_INDEX }; LLVOPartGroup(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp); |