Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unused index_array pointer in LLFace::renderElements and LLFace::pushVertices

Browse Source
This commit is contained in:
Shyotl
2015-06-25 20:24:25 -05:00
parent af81f692de
commit 18c6330af7
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/llface.cpp
View File

@@ -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();
}
//============================================================================

4
indra/newview/llface.h
View File

@@ -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); }