diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp index 3eafd9334cf84969c284f8b43155bb27449950fb..5ae809b3ea7a063df4a6d89c8d36c0fed03ef214 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 5759ccc20a6a1d516d2522a71019be32feda65b7..16df9d65ba35f4e5e130d408e66cc83bd8db34b8 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 ee648d2ae70cde430f425ef797aeff1013226e3d..8bd1d7e841954bbe9d7a4c66f7b687354aca679e 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 fc16ea6129f1896033340e9af18b063ad7a64119..1c5bd7f4d6623841e535a847eada53f56f9abfcc 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