Merge pull request #5852 from secondlife/marchcat/slua-26.2

26.2 -> SLua viewer

1 files changed, 12 insertions, 51 deletions

diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
index e26c53bc2e..ab88e4868e 100644
--- a/indra/llrender/llrender.cpp
+++ b/indra/llrender/llrender.cpp
@@ -1698,64 +1698,25 @@ void LLRender::vertex3f(const GLfloat& x, const GLfloat& y, const GLfloat& z)
         return;
     }
 
-    LLVector4a vert(x, y, z);
-    transform(vert);
-    mVerticesp[mCount] = vert;
-
-    mCount++;
-    mVerticesp[mCount] = mVerticesp[mCount-1];
-    mColorsp[mCount] = mColorsp[mCount-1];
-    mTexcoordsp[mCount] = mTexcoordsp[mCount-1];
-}
-
-void LLRender::transform(LLVector3& vert)
-{
-    if (!mUIOffset.empty())
+    if (mUIOffset.empty())
     {
-        vert += LLVector3(mUIOffset.back().getF32ptr());
-        vert *= LLVector3(mUIScale.back().getF32ptr());
+        mVerticesp[mCount].set(x,y,z);
     }
-}
-
-void LLRender::transform(LLVector4a& vert)
-{
-    if (!mUIOffset.empty())
+    else
     {
+        LLVector4a vert(x, y, z);
         vert.add(mUIOffset.back());
         vert.mul(mUIScale.back());
+        mVerticesp[mCount] = vert;
     }
-}
-
-void LLRender::untransform(LLVector3& vert)
-{
-    if (!mUIOffset.empty())
-    {
-        vert /= LLVector3(mUIScale.back().getF32ptr());
-        vert -= LLVector3(mUIOffset.back().getF32ptr());
-    }
-}
-
-void LLRender::batchTransform(LLVector4a* verts, U32 vert_count)
-{
-    if (!mUIOffset.empty())
-    {
-        const LLVector4a& offset = mUIOffset.back();
-        const LLVector4a& scale = mUIScale.back();
-
-        for (U32 i = 0; i < vert_count; ++i)
-        {
-            verts[i].add(offset);
-            verts[i].mul(scale);
-        }
-    }
-}
 
-void LLRender::vertexBatchPreTransformed(const std::vector<LLVector4a>& verts)
-{
-    vertexBatchPreTransformed(verts.data(), narrow(verts.size()));
+    mCount++;
+    mVerticesp[mCount] = mVerticesp[mCount-1];
+    mColorsp[mCount] = mColorsp[mCount-1];
+    mTexcoordsp[mCount] = mTexcoordsp[mCount-1];
 }
 
-void LLRender::vertexBatchPreTransformed(const LLVector4a* verts, S32 vert_count)
+void LLRender::vertexBatchPreTransformed(LLVector4a* verts, S32 vert_count)
 {
     if (mCount + vert_count > 4094)
     {
@@ -1776,7 +1737,7 @@ void LLRender::vertexBatchPreTransformed(const LLVector4a* verts, S32 vert_count
         mVerticesp[mCount] = mVerticesp[mCount-1];
 }
 
-void LLRender::vertexBatchPreTransformed(const LLVector4a* verts, const LLVector2* uvs, S32 vert_count)
+void LLRender::vertexBatchPreTransformed(LLVector4a* verts, LLVector2* uvs, S32 vert_count)
 {
     if (mCount + vert_count > 4094)
     {
@@ -1800,7 +1761,7 @@ void LLRender::vertexBatchPreTransformed(const LLVector4a* verts, const LLVector
     }
 }
 
-void LLRender::vertexBatchPreTransformed(const LLVector4a* verts, const LLVector2* uvs, const LLColor4U* colors, S32 vert_count)
+void LLRender::vertexBatchPreTransformed(LLVector4a* verts, LLVector2* uvs, LLColor4U* colors, S32 vert_count)
 {
     if (mCount + vert_count > 4094)
     {