diff --git a/indra/newview/llvograss.cpp b/indra/newview/llvograss.cpp index 347d66eca14a8b1c4b852f70813b4e002b2a6d06..60d49a24fb3df525a3433f4eb78829c59dba0ce2 100644 --- a/indra/newview/llvograss.cpp +++ b/indra/newview/llvograss.cpp @@ -459,7 +459,6 @@ void LLVOGrass::plantBlades() mDepth = (face->mCenterLocal - viewerCamera.getOrigin())* viewerCamera.getAtAxis(); mDrawable->setPosition(face->mCenterLocal); mDrawable->movePartition(); - LLPipeline::sCompiles++; } void LLVOGrass::getGeometry(S32 idx, @@ -586,8 +585,6 @@ void LLVOGrass::getGeometry(S32 idx, *indicesp++ = index_offset + 7; index_offset += 8; } - - LLPipeline::sCompiles++; } U32 LLVOGrass::getPartitionType() const diff --git a/indra/newview/llvoground.cpp b/indra/newview/llvoground.cpp index 28bd5a3c97bdf8fce199b34817038859c6e90a42..95264fe77373a3c9db7633431c6b63a8fd4537c0 100644 --- a/indra/newview/llvoground.cpp +++ b/indra/newview/llvoground.cpp @@ -161,6 +161,5 @@ BOOL LLVOGround::updateGeometry(LLDrawable *drawable) *(texCoordsp++) = LLVector2(0.5f, 0.5f); face->getVertexBuffer()->flush(); - LLPipeline::sCompiles++; return TRUE; } diff --git a/indra/newview/llvopartgroup.cpp b/indra/newview/llvopartgroup.cpp index ac5c354efa1ee15b134224201d2b66200c651fbd..d044c97c155ae5459f09c528a851a911af7a1774 100644 --- a/indra/newview/llvopartgroup.cpp +++ b/indra/newview/llvopartgroup.cpp @@ -335,7 +335,6 @@ BOOL LLVOPartGroup::updateGeometry(LLDrawable *drawable) group->setState(LLSpatialGroup::GEOM_DIRTY); } drawable->setNumFaces(0, NULL, getTEImage(0)); - LLPipeline::sCompiles++; return TRUE; } @@ -478,7 +477,6 @@ BOOL LLVOPartGroup::updateGeometry(LLDrawable *drawable) mScale.set(max_scale, max_scale, max_scale); mDrawable->movePartition(); - LLPipeline::sCompiles++; return TRUE; } diff --git a/indra/newview/llvosky.cpp b/indra/newview/llvosky.cpp index a66d36641353a3f8e735c9bd34540a1237732114..9bd92004130d67e98b182603aba6b3ef3df354ea 100644 --- a/indra/newview/llvosky.cpp +++ b/indra/newview/llvosky.cpp @@ -1116,7 +1116,6 @@ BOOL LLVOSky::updateGeometry(LLDrawable *drawable) updateReflectionGeometry(drawable, height_above_water, mSun); } - LLPipeline::sCompiles++; return TRUE; } diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index aa4633bfd3748d25ccaad4486caa835a28d3ae70..a73fe476c5f9fc7fdfe8ca7f1315b6423b6dad78 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -2062,11 +2062,6 @@ BOOL LLVOVolume::updateGeometry(LLDrawable *drawable) // Update face flags updateFaceFlags(); - if(compiled) - { - LLPipeline::sCompiles++; - } - mVolumeChanged = FALSE; mLODChanged = FALSE; mSculptChanged = FALSE; diff --git a/indra/newview/llvowater.cpp b/indra/newview/llvowater.cpp index 879686d1c5d3c58679ace037e38df62c81a7a065..537ff6de5bd2540528fbb5161a264256ad8f299f 100644 --- a/indra/newview/llvowater.cpp +++ b/indra/newview/llvowater.cpp @@ -235,7 +235,6 @@ BOOL LLVOWater::updateGeometry(LLDrawable *drawable) buff->flush(); mDrawable->movePartition(); - LLPipeline::sCompiles++; return TRUE; } diff --git a/indra/newview/llvowlsky.cpp b/indra/newview/llvowlsky.cpp index 4e27d7117d1e9a3dd33c6c9305b69c2408f1a254..f462188b6c0a713dce20d757820835f03f4e77f7 100644 --- a/indra/newview/llvowlsky.cpp +++ b/indra/newview/llvowlsky.cpp @@ -267,8 +267,6 @@ BOOL LLVOWLSky::updateGeometry(LLDrawable * drawable) updateStarColors(); updateStarGeometry(drawable); - LLPipeline::sCompiles++; - return TRUE; } diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index d0b9f07117cab554172ee1d93cb1f9c2fd4d767a..a7ae81b177b6386c951c80632a772ad74ffc1265 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -327,8 +327,6 @@ LLVertexBuffer* ll_create_cube_vb(U32 type_mask, U32 usage); void display_update_camera(); //---------------------------------------- -S32 LLPipeline::sCompiles = 0; - bool LLPipeline::sPickAvatar = true; bool LLPipeline::sDynamicLOD = true; bool LLPipeline::sShowHUDAttachments = true; @@ -1950,7 +1948,6 @@ void LLPipeline::resetFrameStats() { assertInitialized(); - sCompiles = 0; mNumVisibleFaces = 0; if (mOldRenderDebugMask != mRenderDebugMask) diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h index e89b2b75f2922f4a7548a365fb8df1dd6e8c88be..f19eedb6dd88e5eae4f7e5263d4b51a4826ff94f 100644 --- a/indra/newview/pipeline.h +++ b/indra/newview/pipeline.h @@ -570,8 +570,6 @@ class LLPipeline S32 mNumVisibleFaces; - static S32 sCompiles; - 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