From 18c6330af79a1c1bdc6becc4244b5b01702bbf66 Mon Sep 17 00:00:00 2001 From: Shyotl Date: Thu, 25 Jun 2015 20:24:25 -0500 Subject: [PATCH] Remove unused index_array pointer in LLFace::renderElements and LLFace::pushVertices --- indra/newview/llface.cpp | 11 +++++------ indra/newview/llface.h | 4 ++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index 935a951a3..11dc74b82 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -2512,7 +2512,7 @@ void LLFace::renderSetColor() const } } -S32 LLFace::pushVertices(const U16* index_array) const +S32 LLFace::pushVertices() const { if (mIndicesCount) { @@ -2533,19 +2533,19 @@ const LLMatrix4a& LLFace::getRenderMatrix() const return mDrawablep->getRenderMatrix(); } -S32 LLFace::renderElements(const U16 *index_array) const +S32 LLFace::renderElements() const { S32 ret = 0; if (isState(GLOBAL)) { - ret = pushVertices(index_array); + ret = pushVertices(); } else { gGL.pushMatrix(); gGL.multMatrix(getRenderMatrix()); - ret = pushVertices(index_array); + ret = pushVertices(); gGL.popMatrix(); } @@ -2570,8 +2570,7 @@ S32 LLFace::renderIndexed(U32 mask) } mVertexBuffer->setBuffer(mask); - U16* index_array = (U16*) mVertexBuffer->getIndicesPointer(); - return renderElements(index_array); + return renderElements(); } //============================================================================ diff --git a/indra/newview/llface.h b/indra/newview/llface.h index f76bd5ec9..ebd8bb6df 100644 --- a/indra/newview/llface.h +++ b/indra/newview/llface.h @@ -136,10 +136,10 @@ public: void setIndexInTex(U32 ch, S32 index) { llassert(ch < LLRender::NUM_TEXTURE_CHANNELS); mIndexInTex[ch] = index ;} void renderSetColor() const; - S32 renderElements(const U16 *index_array) const; + S32 renderElements() const; S32 renderIndexed (); S32 renderIndexed (U32 mask); - S32 pushVertices(const U16* index_array) const; + S32 pushVertices() const; void setWorldMatrix(const LLMatrix4& mat); const LLTextureEntry* getTextureEntry() const { return mVObjp->getTE(mTEOffset); }