1 files changed, 8 insertions, 23 deletions

diff --git a/indra/newview/llhudrender.cpp b/indra/newview/llhudrender.cpp
index ead45b7dcc..135fba7897 100644
--- a/indra/newview/llhudrender.cpp
+++ b/indra/newview/llhudrender.cpp
@@ -38,6 +38,9 @@
 #include "llviewerwindow.h"
 #include "llui.h"
 
+#include <glm/gtc/matrix_transform.hpp>
+#include <glm/gtc/type_ptr.hpp>
+
 void hud_render_utf8text(const std::string &str, const LLVector3 &pos_agent,
                      const LLFontGL &font,
                      const U8 style,
@@ -100,28 +103,10 @@ void hud_render_text(const LLWString &wstr, const LLVector3 &pos_agent,
 
     //get the render_pos in screen space
 
-    F64 winX, winY, winZ;
     LLRect world_view_rect = gViewerWindow->getWorldViewRectRaw();
-    S32 viewport[4];
-    viewport[0] = world_view_rect.mLeft;
-    viewport[1] = world_view_rect.mBottom;
-    viewport[2] = world_view_rect.getWidth();
-    viewport[3] = world_view_rect.getHeight();
-
-    F64 mdlv[16];
-    F64 proj[16];
-
-    for (U32 i = 0; i < 16; i++)
-    {
-        mdlv[i] = (F64) gGLModelView[i];
-        proj[i] = (F64) gGLProjection[i];
-    }
+    glm::ivec4 viewport(world_view_rect.mLeft, world_view_rect.mBottom, world_view_rect.getWidth(), world_view_rect.getHeight());
 
-#if GLU_VERSION_1_1
-    gluProject(render_pos.mV[0], render_pos.mV[1], render_pos.mV[2],
-                mdlv, proj, (GLint*) viewport,
-                &winX, &winY, &winZ);
-#endif
+    glm::vec3 win_coord = glm::project(glm::make_vec3(render_pos.mV), get_current_modelview(), get_current_projection(), viewport);
 
     //fonts all render orthographically, set up projection``
     gGL.matrixMode(LLRender::MM_PROJECTION);
@@ -133,11 +118,11 @@ void hud_render_text(const LLWString &wstr, const LLVector3 &pos_agent,
     gl_state_for_2d(world_view_rect.getWidth(), world_view_rect.getHeight());
     gViewerWindow->setup3DViewport();
 
-    winX -= world_view_rect.mLeft;
-    winY -= world_view_rect.mBottom;
+    win_coord.x -= world_view_rect.mLeft;
+    win_coord.y -= world_view_rect.mBottom;
     LLUI::loadIdentity();
     gGL.loadIdentity();
-    LLUI::translate((F32) winX*1.0f/LLFontGL::sScaleX, (F32) winY*1.0f/(LLFontGL::sScaleY), -(((F32) winZ*2.f)-1.f));
+    LLUI::translate((F32) win_coord.x*1.0f/LLFontGL::sScaleX, (F32) win_coord.y*1.0f/(LLFontGL::sScaleY), -(((F32) win_coord.z*2.f)-1.f));
     F32 right_x;
 
     font.render(wstr, 0, 0, 1, color, LLFontGL::LEFT, LLFontGL::BASELINE, style, shadow, static_cast<S32>(wstr.length()), 1000, &right_x, /*use_ellipses*/false, /*use_color*/true);