From 55be956847b092419a0bca3c1246d292dfb01db9 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Thu, 21 Jan 2021 22:14:52 -0500
Subject: [PATCH] Dead code party in here!
---
indra/newview/llvograss.cpp | 3 ---
indra/newview/llvoground.cpp | 1 -
indra/newview/llvopartgroup.cpp | 2 --
indra/newview/llvosky.cpp | 1 -
indra/newview/llvovolume.cpp | 5 -----
indra/newview/llvowater.cpp | 1 -
indra/newview/llvowlsky.cpp | 2 --
indra/newview/pipeline.cpp | 3 ---
indra/newview/pipeline.h | 2 --
9 files changed, 20 deletions(-)
diff --git a/indra/newview/llvograss.cpp b/indra/newview/llvograss.cpp
index 347d66eca14..60d49a24fb3 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 28bd5a3c97b..95264fe7737 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 ac5c354efa1..d044c97c155 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 a66d3664135..9bd92004130 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 aa4633bfd37..a73fe476c5f 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 879686d1c5d..537ff6de5bd 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 4e27d7117d1..f462188b6c0 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 d0b9f07117c..a7ae81b177b 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 e89b2b75f29..f19eedb6dd8 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
--
GitLab