diff options
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llhudobject.cpp | 8 | ||||
| -rw-r--r-- | indra/newview/llviewerdisplay.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/pipeline.cpp | 5 |
3 files changed, 9 insertions, 7 deletions
diff --git a/indra/newview/llhudobject.cpp b/indra/newview/llhudobject.cpp index 45fa09e1a1..fe6793ce73 100644 --- a/indra/newview/llhudobject.cpp +++ b/indra/newview/llhudobject.cpp @@ -267,6 +267,13 @@ void LLHUDObject::updateAll() // static void LLHUDObject::renderAll() { + LLGLSUIDefault gls_ui; + + gGL.color4f(1, 1, 1, 1); + + gUIProgram.bind(); + LLGLDepthTest depth(GL_FALSE, GL_FALSE); + LLHUDObject *hud_objp; hud_object_list_t::iterator object_it; @@ -285,6 +292,7 @@ void LLHUDObject::renderAll() } LLVertexBuffer::unbind(); + gUIProgram.unbind(); } // static diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index 189c60844b..a617bdb2cb 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -1420,9 +1420,8 @@ void render_ui(F32 zoom_factor, int subfield) if (render_ui) { LL_PROFILE_ZONE_NAMED_CATEGORY_UI("UI 2D"); //LL_RECORD_BLOCK_TIME(FTM_RENDER_UI_2D); + LLHUDObject::renderAll(); render_ui_2d(); - LLGLState::checkStates(); - gGL.flush(); } gViewerWindow->setup2DRender(); diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 93ae6e99a5..ef7ebda834 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -4010,7 +4010,6 @@ void render_hud_elements() LL_PROFILE_ZONE_SCOPED_CATEGORY_UI; //LL_RECORD_BLOCK_TIME(FTM_RENDER_UI); gPipeline.disableLights(); - LLGLDisable fog(GL_FOG); LLGLSUIDefault gls_ui; //LLGLEnable stencil(GL_STENCIL_TEST); @@ -4038,9 +4037,6 @@ void render_hud_elements() } LLViewerParcelMgr::getInstance()->render(); LLViewerParcelMgr::getInstance()->renderParcelCollision(); - - // Render name tags. - LLHUDObject::renderAll(); } else if (gForceRenderLandFence) { @@ -4053,7 +4049,6 @@ void render_hud_elements() } gUIProgram.unbind(); - gGL.flush(); } void LLPipeline::renderHighlights() |