From 0e3f8db632e2f616b0ab9bd3363c20d2f1acb549 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Thu, 13 Oct 2022 11:20:23 -0500
Subject: [PATCH] SL-18190 Fix for blurry name tags.
---
indra/newview/llhudobject.cpp | 8 ++++++++
indra/newview/llviewerdisplay.cpp | 3 +--
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 45fa09e1a1c..fe6793ce730 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 189c60844b8..a617bdb2cb8 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 93ae6e99a52..ef7ebda8341 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()
--
GitLab