diff options
author | Rick Pasetto <rick@lindenlab.com> | 2009-11-06 13:09:48 -0800 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-06 13:09:48 -0800 |
commit | 78db8dd83b76466df83abc32d56aa74ac7b180f3 (patch) | |
tree | 369b4d8db3081fcf71a27572a00d310c7b9aaaf6 /indra/newview/lldrawpool.cpp | |
parent | d4f790f72866b43956ce4216bf6471c85f4afc6c (diff) | |
parent | 3f8172707833f30d3c39d165c975bd3d97511080 (diff) |
merge from remote repo
Diffstat (limited to 'indra/newview/lldrawpool.cpp')
-rw-r--r-- | indra/newview/lldrawpool.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/indra/newview/lldrawpool.cpp b/indra/newview/lldrawpool.cpp index d8c34581d5..95ddacb722 100644 --- a/indra/newview/lldrawpool.cpp +++ b/indra/newview/lldrawpool.cpp @@ -279,7 +279,7 @@ S32 LLFacePool::drawLoopSetTex(face_array_t& face_list, S32 stage) iter != face_list.end(); iter++) { LLFace *facep = *iter; - gGL.getTexUnit(stage)->bind(facep->getTexture()); + gGL.getTexUnit(stage)->bind(facep->getTexture(), TRUE) ; gGL.getTexUnit(0)->activate(); res += facep->renderIndexed(); } @@ -475,17 +475,13 @@ void LLRenderPass::pushBatch(LLDrawInfo& params, U32 mask, BOOL texture) { if (params.mTexture.notNull()) { - gGL.getTexUnit(0)->bind(params.mTexture.get()); + gGL.getTexUnit(0)->bind(params.mTexture, TRUE) ; if (params.mTextureMatrix) { glMatrixMode(GL_TEXTURE); glLoadMatrixf((GLfloat*) params.mTextureMatrix->mMatrix); gPipeline.mTextureMatrixOps++; } - if(params.mTexture.notNull())//will be removed. - { - params.mTexture->addTextureStats(params.mVSize); - } } else { |