diff options
| author | Palmer Truelson <palmer@lindenlab.com> | 2010-02-12 21:04:51 -0800 |
|---|---|---|
| committer | Palmer Truelson <palmer@lindenlab.com> | 2010-02-12 21:04:51 -0800 |
| commit | 651b14fcae01b089522f3672bbf35bfbe7268aac (patch) | |
| tree | f63793ae6b972f6205b07769dd7abc9c91690d71 /indra/newview/llviewerwindow.cpp | |
| parent | 979ddb2ec952f836f7cde7cbc85559b8e9582416 (diff) | |
Backed out davep's UI optimization. changeset 3134cb7bb181
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index f6227c2dd6..de4317b2de 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -476,10 +476,6 @@ public: } ypos += y_inc; - addText(xpos, ypos, llformat("UI Verts/Calls: %d/%d", LLRender::sUIVerts, LLRender::sUICalls)); - LLRender::sUICalls = LLRender::sUIVerts = 0; - ypos += y_inc; - addText(xpos,ypos, llformat("%d/%d Nodes visible", gPipeline.mNumVisibleNodes, LLSpatialGroup::sNodeCount)); ypos += y_inc; @@ -1847,15 +1843,12 @@ void LLViewerWindow::drawDebugText() { gGL.color4f(1,1,1,1); gGL.pushMatrix(); - gGL.pushUIMatrix(); { // scale view by UI global scale factor and aspect ratio correction factor - gGL.scaleUI(mDisplayScale.mV[VX], mDisplayScale.mV[VY], 1.f); + glScalef(mDisplayScale.mV[VX], mDisplayScale.mV[VY], 1.f); mDebugText->draw(); } - gGL.popUIMatrix(); gGL.popMatrix(); - gGL.flush(); } @@ -1903,11 +1896,9 @@ void LLViewerWindow::draw() // No translation needed, this view is glued to 0,0 gGL.pushMatrix(); - LLUI::pushMatrix(); { - // scale view by UI global scale factor and aspect ratio correction factor - gGL.scaleUI(mDisplayScale.mV[VX], mDisplayScale.mV[VY], 1.f); + glScalef(mDisplayScale.mV[VX], mDisplayScale.mV[VY], 1.f); LLVector2 old_scale_factor = LLUI::sGLScaleFactor; // apply camera zoom transform (for high res screenshots) @@ -1973,7 +1964,6 @@ void LLViewerWindow::draw() LLUI::sGLScaleFactor = old_scale_factor; } - LLUI::popMatrix(); gGL.popMatrix(); #if LL_DEBUG |