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

Removed pointless redundant gGL.flush() calls from llworldmapview.

Browse Source
This commit is contained in:
Shyotl
2012-11-09 18:33:44 -06:00
parent 313cce23db
commit 01868e46fe
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/llworldmapview.cpp
View File

@@ -337,7 +337,6 @@ void LLWorldMapView::draw()
gGL.matrixMode(LLRender::MM_MODELVIEW); gGL.matrixMode(LLRender::MM_MODELVIEW);
// Clear the background alpha to 0 // Clear the background alpha to 0
gGL.flush();
gGL.setColorMask(false, true); gGL.setColorMask(false, true);
gGL.setAlphaRejectSettings(LLRender::CF_GREATER_EQUAL, 0.f); gGL.setAlphaRejectSettings(LLRender::CF_GREATER_EQUAL, 0.f);
gGL.setSceneBlendType(LLRender::BT_REPLACE); gGL.setSceneBlendType(LLRender::BT_REPLACE);
@@ -345,8 +344,6 @@ void LLWorldMapView::draw()
gl_rect_2d(0, height, width, 0); gl_rect_2d(0, height, width, 0);
} }
gGL.flush();
gGL.setAlphaRejectSettings(LLRender::CF_DEFAULT); gGL.setAlphaRejectSettings(LLRender::CF_DEFAULT);
gGL.setColorMask(true, true); gGL.setColorMask(true, true);
gGL.setSceneBlendType(LLRender::BT_ALPHA); gGL.setSceneBlendType(LLRender::BT_ALPHA);
@@ -355,7 +352,6 @@ void LLWorldMapView::draw()
drawMipmap(width, height); drawMipmap(width, height);
else else
drawTiles(width, height); drawTiles(width, height);
gGL.flush();
LLFontGL* font = LLFontGL::getFontSansSerifSmall(); LLFontGL* font = LLFontGL::getFontSansSerifSmall();
@@ -591,6 +587,8 @@ void LLWorldMapView::draw()
LLView::draw(); LLView::draw();
updateVisibleBlocks(); updateVisibleBlocks();
gGL.flush();
} // end draw() } // end draw()
@@ -693,7 +691,6 @@ void LLWorldMapView::drawTiles(S32 width, S32 height) {
// Draw map image into RGB // Draw map image into RGB
//gGL.blendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); //gGL.blendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
gGL.flush();
gGL.setColorMask(true, false); gGL.setColorMask(true, false);
gGL.color4f(1.f, 1.f, 1.f, layer_alpha); gGL.color4f(1.f, 1.f, 1.f, layer_alpha);
@@ -709,7 +706,6 @@ void LLWorldMapView::drawTiles(S32 width, S32 height) {
gGL.end(); gGL.end();
// draw an alpha of 1 where the sims are visible // draw an alpha of 1 where the sims are visible
gGL.flush();
gGL.setColorMask(false, true); gGL.setColorMask(false, true);
gGL.color4f(1.f, 1.f, 1.f, 1.f); gGL.color4f(1.f, 1.f, 1.f, 1.f);
@@ -725,7 +721,6 @@ void LLWorldMapView::drawTiles(S32 width, S32 height) {
gGL.end(); gGL.end();
} }
gGL.flush();
gGL.setAlphaRejectSettings(LLRender::CF_DEFAULT); gGL.setAlphaRejectSettings(LLRender::CF_DEFAULT);
gGL.setColorMask(true, true); gGL.setColorMask(true, true);
@@ -915,7 +910,6 @@ void LLWorldMapView::drawTiles(S32 width, S32 height) {
if (true /*V3: REGION_FLAGS_NULL_LAYER doesn't exist... (info->getRegionFlags() & REGION_FLAGS_NULL_LAYER) == 0*/) if (true /*V3: REGION_FLAGS_NULL_LAYER doesn't exist... (info->getRegionFlags() & REGION_FLAGS_NULL_LAYER) == 0*/)
{ {
// draw an alpha of 1 where the sims are visible (except NULL sims) // draw an alpha of 1 where the sims are visible (except NULL sims)
gGL.flush();
gGL.setSceneBlendType(LLRender::BT_REPLACE); gGL.setSceneBlendType(LLRender::BT_REPLACE);
gGL.setColorMask(false, true); gGL.setColorMask(false, true);
gGL.color4f(1.f, 1.f, 1.f, 1.f); gGL.color4f(1.f, 1.f, 1.f, 1.f);
@@ -928,7 +922,6 @@ void LLWorldMapView::drawTiles(S32 width, S32 height) {
gGL.vertex2f(right, top); gGL.vertex2f(right, top);
gGL.end(); gGL.end();
gGL.flush();
gGL.setColorMask(true, true); gGL.setColorMask(true, true);
} }
} }
@@ -1040,7 +1033,7 @@ void LLWorldMapView::drawAgents()
// Here's how we'd choose the color if info.mID were available but it's not being sent: // Here's how we'd choose the color if info.mID were available but it's not being sent:
//LLColor4 color = (agent_count == 1 && is_agent_friend(info.mID)) ? friend_color : avatar_color; //LLColor4 color = (agent_count == 1 && is_agent_friend(info.mID)) ? friend_color : avatar_color;
drawImageStack(info.getGlobalPosition(), sAvatarSmallImage, agent_count, 3.f, avatar_color); drawImageStack(info.getGlobalPosition(), sAvatarSmallImage, agent_count, 3.f, avatar_color);
} }
LLWorldMap::getInstance()->mNumAgents[handle] = sim_agent_count; // override mNumAgents for this sim LLWorldMap::getInstance()->mNumAgents[handle] = sim_agent_count; // override mNumAgents for this sim
} }
else else
@@ -1056,8 +1049,8 @@ void LLWorldMapView::drawAgents()
S32 agent_count = (S32)(((num_agents-1) * agents_scale + (num_agents-1) * 0.1f)+.1f) + 1; S32 agent_count = (S32)(((num_agents-1) * agents_scale + (num_agents-1) * 0.1f)+.1f) + 1;
drawImageStack(region_center, sAvatarSmallImage, agent_count, 3.f, avatar_color); drawImageStack(region_center, sAvatarSmallImage, agent_count, 3.f, avatar_color);
} }
}
} }
}
} }