Clean up many more hot path loops

indra/newview/lldrawpoolalpha.cpp

@@ -327,7 +327,7 @@ void LLDrawPoolAlpha::render(S32 pass)
 
 void LLDrawPoolAlpha::renderAlphaHighlight(U32 mask)
 {
-	for (LLCullResult::sg_iterator i = gPipeline.beginAlphaGroups(); i != gPipeline.endAlphaGroups(); ++i)
+	for (LLCullResult::sg_iterator i = gPipeline.beginAlphaGroups(), i_end = gPipeline.endAlphaGroups(); i != i_end; ++i)
 	{
 		LLSpatialGroup* group = *i;
 		if (group->getSpatialPartition()->mRenderByGroup &&
@@ -613,7 +613,7 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask, S32 pass)
 	
 	BOOL use_shaders = gPipeline.canUseVertexShaders();
 		
-	for (LLCullResult::sg_iterator i = gPipeline.beginAlphaGroups(); i != gPipeline.endAlphaGroups(); ++i)
+	for (LLCullResult::sg_iterator i = gPipeline.beginAlphaGroups(), i_end = gPipeline.endAlphaGroups(); i != i_end; ++i)
 	{
 		LLSpatialGroup* group = *i;
 		llassert(group);
@@ -638,9 +638,9 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask, S32 pass)
 
 			LLSpatialGroup::drawmap_elem_t& draw_info = group->mDrawMap[LLRenderPass::PASS_ALPHA];
 
-			for (LLSpatialGroup::drawmap_elem_t::iterator k = draw_info.begin(); k != draw_info.end(); ++k)	
+			for (LLDrawInfo* k : draw_info)
 			{
-				LLDrawInfo& params = **k;
+				LLDrawInfo& params = *k;
                 U32 have_mask = params.mVertexBuffer->getTypeMask() & mask;
 				if (have_mask != mask)
 				{ //FIXME!

indra/newview/lldrawpoolbump.cpp

@@ -639,9 +639,9 @@ void LLDrawPoolBump::renderGroup(LLSpatialGroup* group, U32 type, U32 mask, BOOL
 {					
 	LLSpatialGroup::drawmap_elem_t& draw_info = group->mDrawMap[type];	
 	
-	for (LLSpatialGroup::drawmap_elem_t::iterator k = draw_info.begin(); k != draw_info.end(); ++k) 
+	for (LLDrawInfo* k : draw_info)
 	{
-		LLDrawInfo& params = **k;
+		LLDrawInfo& params = *k;
 		
 		applyModelMatrix(params);
 

indra/newview/lldrawpoolterrain.cpp

@@ -294,11 +294,8 @@ void LLDrawPoolTerrain::drawLoop()
 {
 	if (!mDrawFace.empty())
 	{
-		for (std::vector<LLFace*>::iterator iter = mDrawFace.begin();
-			 iter != mDrawFace.end(); iter++)
+		for (LLFace* facep : mDrawFace)
 		{
-			LLFace *facep = *iter;
-
 			LLMatrix4* model_matrix = &(facep->getDrawable()->getRegion()->mRenderMatrix);
 
 			if (model_matrix != gGLLastMatrix)
@@ -934,10 +931,8 @@ void LLDrawPoolTerrain::renderOwnership()
 
 	const F32 TEXTURE_FUDGE = 257.f / 256.f;
 	gGL.scalef( TEXTURE_FUDGE, TEXTURE_FUDGE, 1.f );
-	for (std::vector<LLFace*>::iterator iter = mDrawFace.begin();
-		 iter != mDrawFace.end(); iter++)
+	for (LLFace* facep : mDrawFace)
 	{
-		LLFace *facep = *iter;
 		facep->renderIndexed(LLVertexBuffer::MAP_VERTEX |
 							LLVertexBuffer::MAP_TEXCOORD0);
 	}
@@ -953,10 +948,8 @@ void LLDrawPoolTerrain::dirtyTextures(const std::set<LLViewerFetchedTexture*>& t
 	LLViewerFetchedTexture* tex = LLViewerTextureManager::staticCastToFetchedTexture(mTexturep) ;
 	if (tex && textures.find(tex) != textures.end())
 	{
-		for (std::vector<LLFace*>::iterator iter = mReferences.begin();
-			 iter != mReferences.end(); iter++)
+		for (LLFace* facep : mReferences)
 		{
-			LLFace *facep = *iter;
 			gPipeline.markTextured(facep->getDrawable());
 		}
 	}

indra/newview/lldrawpooltree.cpp

@@ -104,10 +104,8 @@ void LLDrawPoolTree::render(S32 pass)
 // [/SL:KB]
 //	gGL.getTexUnit(sDiffTex)->bind(mTexturep);
 				
-	for (std::vector<LLFace*>::iterator iter = mDrawFace.begin();
-		 iter != mDrawFace.end(); iter++)
+	for (LLFace* face : mDrawFace)
 	{
-		LLFace *face = *iter;
 		LLVertexBuffer* buff = face->getVertexBuffer();
 
 		if(buff)

indra/newview/lldrawpoolwater.cpp

@@ -160,10 +160,8 @@ void LLDrawPoolWater::render(S32 pass)
 	}
 
 	//do a quick 'n dirty depth sort
-	for (std::vector<LLFace*>::iterator iter = mDrawFace.begin();
-			 iter != mDrawFace.end(); iter++)
+	for (LLFace* facep : mDrawFace)
 	{
-		LLFace* facep = *iter;
 		facep->mDistance = -facep->mCenterLocal.mV[2];
 	}
 
@@ -251,10 +249,8 @@ void LLDrawPoolWater::render(S32 pass)
 	glStencilOp(GL_KEEP, GL_REPLACE, GL_KEEP);
 	glStencilFunc(GL_ALWAYS, 0, 0xFFFFFFFF);
 
-	for (std::vector<LLFace*>::iterator iter = mDrawFace.begin();
-		 iter != mDrawFace.end(); iter++)
+	for (LLFace* face : mDrawFace)
 	{
-		LLFace *face = *iter;
 		if (voskyp->isReflFace(face))
 		{
 			continue;
@@ -302,10 +298,8 @@ void LLDrawPoolWater::render(S32 pass)
 
 		gGL.getTexUnit(0)->setTextureBlendType(LLTexUnit::TB_MULT);
 
-		for (std::vector<LLFace*>::iterator iter = mDrawFace.begin();
-			 iter != mDrawFace.end(); iter++)
+		for (LLFace* face : mDrawFace)
 		{
-			LLFace *face = *iter;
 			if (voskyp->isReflFace(face))
 			{
 				//refl_face = face;
@@ -423,10 +417,8 @@ void LLDrawPoolWater::renderOpaqueLegacyWater()
 
 	gGL.diffuseColor3f(1.f, 1.f, 1.f);
 
-	for (std::vector<LLFace*>::iterator iter = mDrawFace.begin();
-		 iter != mDrawFace.end(); iter++)
+	for (LLFace* face : mDrawFace)
 	{
-		LLFace *face = *iter;
 		if (voskyp->isReflFace(face))
 		{
 			continue;

indra/newview/lldynamictexture.cpp

@@ -231,10 +231,8 @@ BOOL LLViewerDynamicTexture::updateAllInstances()
 	BOOL ret = FALSE ;
 	for( S32 order = 0; order < ORDER_COUNT; order++ )
 	{
-		for (instance_list_t::iterator iter = LLViewerDynamicTexture::sInstances[order].begin();
-			 iter != LLViewerDynamicTexture::sInstances[order].end(); ++iter)
+		for (LLViewerDynamicTexture* dynamicTexture : LLViewerDynamicTexture::sInstances[order])
 		{
-			LLViewerDynamicTexture *dynamicTexture = *iter;
 			if (dynamicTexture->needsRender())
 			{				
 				glClear(GL_DEPTH_BUFFER_BIT);
@@ -276,10 +274,8 @@ void LLViewerDynamicTexture::destroyGL()
 {
 	for( S32 order = 0; order < ORDER_COUNT; order++ )
 	{
-		for (instance_list_t::iterator iter = LLViewerDynamicTexture::sInstances[order].begin();
-			 iter != LLViewerDynamicTexture::sInstances[order].end(); ++iter)
+		for (LLViewerDynamicTexture* dynamicTexture : LLViewerDynamicTexture::sInstances[order])
 		{
-			LLViewerDynamicTexture *dynamicTexture = *iter;
 			dynamicTexture->destroyGLTexture() ;
 		}
 	}
@@ -298,10 +294,8 @@ void LLViewerDynamicTexture::restoreGL()
 	
 	for( S32 order = 0; order < ORDER_COUNT; order++ )
 	{
-		for (instance_list_t::iterator iter = LLViewerDynamicTexture::sInstances[order].begin();
-			 iter != LLViewerDynamicTexture::sInstances[order].end(); ++iter)
+		for (LLViewerDynamicTexture* dynamicTexture : LLViewerDynamicTexture::sInstances[order])
 		{
-			LLViewerDynamicTexture *dynamicTexture = *iter;
 			dynamicTexture->restoreGLTexture() ;
 		}
 	}