From 4fe23f149ae1383d5aedbf44badec3e560dfcfa6 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sun, 31 Oct 2021 18:18:12 -0400
Subject: [PATCH] Small opts
---
indra/llrender/llrender.cpp | 2 +-
indra/llrender/llrender.h | 2 +-
indra/newview/pipeline.cpp | 6 ------
indra/newview/pipeline.h | 2 --
4 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
index 3eafd9334cf..5ae809b3ea7 100644
--- a/indra/llrender/llrender.cpp
+++ b/indra/llrender/llrender.cpp
@@ -2478,7 +2478,7 @@ void set_current_modelview(const glh::matrix4f& mat)
copy_matrix(mat, gGLModelView);
}
-void set_current_projection(glh::matrix4f& mat)
+void set_current_projection(const glh::matrix4f& mat)
{
copy_matrix(mat, gGLProjection);
}
diff --git a/indra/llrender/llrender.h b/indra/llrender/llrender.h
index 5759ccc20a6..16df9d65ba3 100644
--- a/indra/llrender/llrender.h
+++ b/indra/llrender/llrender.h
@@ -545,7 +545,7 @@ glh::matrix4f get_last_projection();
void copy_matrix(const glh::matrix4f& src, F32* dst);
void set_current_modelview(const glh::matrix4f& mat);
-void set_current_projection(glh::matrix4f& mat);
+void set_current_projection(const glh::matrix4f& mat);
glh::matrix4f gl_ortho(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat znear, GLfloat zfar);
glh::matrix4f gl_perspective(GLfloat fovy, GLfloat aspect, GLfloat zNear, GLfloat zFar);
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index ee648d2ae70..8bd1d7e8419 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -398,8 +398,6 @@ LLPipeline::LLPipeline() :
mMatrixOpCount(0),
mTextureMatrixOps(0),
mNumVisibleNodes(0),
- mNumVisibleFaces(0),
-
mInitialized(false),
mVertexShadersEnabled(false),
mVertexShadersLoaded(0),
@@ -2096,8 +2094,6 @@ void LLPipeline::resetFrameStats()
{
assertInitialized();
- mNumVisibleFaces = 0;
-
if (mOldRenderDebugMask != mRenderDebugMask)
{
gObjectList.clearDebugText();
@@ -3750,8 +3746,6 @@ void LLPipeline::stateSort(LLDrawable* drawablep, LLCamera& camera)
}
}
}
-
- mNumVisibleFaces += drawablep->getNumFaces();
}
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h
index fc16ea6129f..1c5bd7f4d66 100644
--- a/indra/newview/pipeline.h
+++ b/indra/newview/pipeline.h
@@ -569,8 +569,6 @@ class LLPipeline
S32 mDebugSculptUploadCost;
S32 mDebugMeshUploadCost;
- S32 mNumVisibleFaces;
-
static bool sShowHUDAttachments;
static bool sForceOldBakedUpload; // If true will not use capabilities to upload baked textures.
static S32 sUseOcclusion; // 0 = no occlusion, 1 = read only, 2 = read/write
--
GitLab