From 0d8af269dfbddd5c49448c7eb4db4ade8cf9f7fb Mon Sep 17 00:00:00 2001 From: Ansariel Date: Mon, 11 Aug 2025 13:53:56 +0200 Subject: [PATCH] Fix remaining unused variable issues --- indra/newview/daeexport.cpp | 2 -- indra/newview/gltf/asset.cpp | 4 ++++ indra/newview/llagent.cpp | 2 -- indra/newview/llagentcamera.cpp | 18 +++++++++--------- indra/newview/lldrawpoolwater.cpp | 4 ++-- indra/newview/llmodelpreview.cpp | 4 ++-- indra/newview/llviewertexture.cpp | 4 ++-- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/indra/newview/daeexport.cpp b/indra/newview/daeexport.cpp index 4fa44bac23..a26f2f4faf 100644 --- a/indra/newview/daeexport.cpp +++ b/indra/newview/daeexport.cpp @@ -798,7 +798,6 @@ bool DAESaver::saveDAE(std::string filename) for (obj_info_t::iterator obj_iter = mObjects.begin(); obj_iter != mObjects.end(); ++obj_iter) { LLViewerObject* obj = obj_iter->first; - S32 total_num_vertices = 0; std::string name = ""; if (name.empty()) name = llformat("prim%d", prim_nr++); @@ -821,7 +820,6 @@ bool DAESaver::saveDAE(std::string filename) if (skipFace(obj->getTE(face_num))) continue; const LLVolumeFace* face = (LLVolumeFace*)&obj->getVolume()->getVolumeFace(face_num); - total_num_vertices += face->mNumVertices; v4adapt verts(face->mPositions); v4adapt norms(face->mNormals); diff --git a/indra/newview/gltf/asset.cpp b/indra/newview/gltf/asset.cpp index e24aea4a28..b9a8879fb1 100644 --- a/indra/newview/gltf/asset.cpp +++ b/indra/newview/gltf/asset.cpp @@ -589,7 +589,9 @@ bool Asset::prep() for (U32 variant = 0; variant < LLGLSLShader::NUM_GLTF_VARIANTS; ++variant) { +#if SHOW_ASSERT U32 attribute_mask = 0; +#endif // for each mesh for (auto& mesh : mMeshes) { @@ -607,7 +609,9 @@ bool Asset::prep() // all primitives of a given variant and material should all have the same attribute mask llassert(attribute_mask == 0 || primitive.mAttributeMask == attribute_mask); +#if SHOW_ASSERT attribute_mask |= primitive.mAttributeMask; +#endif } } } diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index e0cba74045..fc7022b017 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -6685,7 +6685,6 @@ void LLAgent::sendAgentSetAppearance() } - S32 transmitted_params = 0; for (LLViewerVisualParam* param = (LLViewerVisualParam*)gAgentAvatarp->getFirstVisualParam(); param; param = (LLViewerVisualParam*)gAgentAvatarp->getNextVisualParam()) @@ -6699,7 +6698,6 @@ void LLAgent::sendAgentSetAppearance() const F32 param_value = param->getWeight(); const U8 new_weight = F32_to_U8(param_value, param->getMinWeight(), param->getMaxWeight()); msg->addU8Fast(_PREHASH_ParamValue, new_weight ); - transmitted_params++; } } diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp index 627d9a0095..57bbdfeacb 100644 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -204,7 +204,7 @@ LLAgentCamera::LLAgentCamera() : resetPanDiff(); resetOrbitDiff(); // Camera roll (from Alchemy) - resetCameraRoll(); + resetCameraRoll(); // } @@ -388,7 +388,7 @@ void LLAgentCamera::resetView(bool reset_camera, bool change_camera, bool moveme mCameraFOVZoomFactor = 0.f; // Camera roll (from Alchemy) - resetCameraRoll(); + resetCameraRoll(); // } resetPanDiff(); @@ -974,7 +974,7 @@ void LLAgentCamera::resetCameraOrbit() cameraZoomIn(1.f); resetOrbitDiff(); // Camera roll (from Alchemy) - resetCameraRoll(); + resetCameraRoll(); // } @@ -2157,9 +2157,9 @@ LLVector3d LLAgentCamera::calcCameraPositionTargetGlobal(bool *hit_limit) bool fCamAvDistClamped, fCamAvDistLocked = false; float nCamAvDistLimitMin, nCamAvDistLimitMax; if ((fCamAvDistClamped = RlvActions::getCameraAvatarDistanceLimits(nCamAvDistLimitMin, nCamAvDistLimitMax))) fCamAvDistLocked = nCamAvDistLimitMin == nCamAvDistLimitMax; - bool fCamOriginDistClamped, fCamOriginDistLocked = false; float nCamOriginDistLimitMin, nCamOriginDistLimitMax; - if ((fCamOriginDistClamped = RlvActions::getCameraOriginDistanceLimits(nCamOriginDistLimitMin, nCamOriginDistLimitMax))) - fCamOriginDistLocked = nCamOriginDistLimitMin == nCamOriginDistLimitMax; + float nCamOriginDistLimitMin; + float nCamOriginDistLimitMax; + const bool fCamOriginDistClamped = RlvActions::getCameraOriginDistanceLimits(nCamOriginDistLimitMin, nCamOriginDistLimitMax); // Check focus distance limits if ( (fCamOriginDistClamped) && (!fCamAvDistLocked) ) @@ -2793,7 +2793,7 @@ void LLAgentCamera::switchCameraPreset(ECameraPreset preset) resetPanDiff(); resetOrbitDiff(); // Camera roll (from Alchemy) - resetCameraRoll(); + resetCameraRoll(); // gSavedSettings.setU32("CameraPresetType", mCameraPreset); @@ -3334,7 +3334,7 @@ void LLAgentCamera::storeCameraPosition() LLVector3d forward = LLVector3d(1.0, 0.0, 0.0) * LLViewerCamera::getInstance()->getQuaternion() + getCameraPositionGlobal(); gSavedPerAccountSettings.setVector3d("FSStoredCameraFocus", forward); // Camera roll (from Alchemy) - gSavedPerAccountSettings.setF32("ALStoredCameraRoll", mRollAngle); + gSavedPerAccountSettings.setF32("ALStoredCameraRoll", mRollAngle); // LLUUID stored_camera_focus_object_id = LLUUID::null; @@ -3381,7 +3381,7 @@ void LLAgentCamera::loadCameraPosition() unlockView(); setCameraPosAndFocusGlobal(stored_camera_pos, stored_camera_focus, stored_camera_focus_object_id); // Camera roll (from Alchemy) - mRollAngle = stored_camera_roll; + mRollAngle = stored_camera_roll; // } // FIRE-7758: Save/load camera position feature diff --git a/indra/newview/lldrawpoolwater.cpp b/indra/newview/lldrawpoolwater.cpp index 8826ba56a0..92759d9d49 100644 --- a/indra/newview/lldrawpoolwater.cpp +++ b/indra/newview/lldrawpoolwater.cpp @@ -147,7 +147,7 @@ void LLDrawPoolWater::renderPostDeferred(S32 pass) gGL.setColorMask(true, true); LLColor3 light_diffuse(0, 0, 0); - F32 light_exp = 0.0f; + //F32 light_exp = 0.0f; // Remove unused variable LLEnvironment& environment = LLEnvironment::instance(); LLSettingsWater::ptr_t pwater = environment.getCurrentWater(); @@ -183,7 +183,7 @@ void LLDrawPoolWater::renderPostDeferred(S32 pass) // Apply magic numbers translating light direction into intensities light_dir.normalize(); F32 ground_proj_sq = light_dir.mV[0] * light_dir.mV[0] + light_dir.mV[1] * light_dir.mV[1]; - light_exp = llmax(32.f, 256.f * powf(ground_proj_sq, 16.0f)); + //light_exp = llmax(32.f, 256.f * powf(ground_proj_sq, 16.0f)); // Remove unused variable if (0.f < light_diffuse.normalize()) // Normalizing a color? Puzzling... { light_diffuse *= (1.5f + (6.f * ground_proj_sq)); diff --git a/indra/newview/llmodelpreview.cpp b/indra/newview/llmodelpreview.cpp index d503b4f42f..653292089c 100644 --- a/indra/newview/llmodelpreview.cpp +++ b/indra/newview/llmodelpreview.cpp @@ -1928,7 +1928,7 @@ void LLModelPreview::genGlodLODs(S32 which_lod, U32 decimation, bool enforce_tri mModel[lod].resize(mBaseModel.size()); mVertexBuffer[lod].clear(); - U32 submeshes = 0; + //U32 submeshes = 0; // Remove unused variable mRequestedTriangleCount[lod] = (S32)((F32)triangle_count / triangle_ratio); mRequestedErrorThreshold[lod] = lod_error_threshold; @@ -2073,7 +2073,7 @@ void LLModelPreview::genGlodLODs(S32 which_lod, U32 decimation, bool enforce_tri buff->getIndexStrider(index); target_model->setVolumeFaceData(names[i], pos, norm, tc, index, buff->getNumVerts(), buff->getNumIndices()); - ++submeshes; + //++submeshes; // Remove unused variable if (!validate_face(target_model->getVolumeFace(names[i]))) { diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 0a8029b26d..4ec5756803 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -544,7 +544,7 @@ void LLViewerTexture::updateClass() bool is_low = is_sys_low || over_pct > 0.f; static bool was_low = false; - static bool was_sys_low = false; + //static bool was_sys_low = false; // Remove unused variable if (is_low && !was_low) { @@ -562,7 +562,7 @@ void LLViewerTexture::updateClass() } was_low = is_low; - was_sys_low = is_sys_low; + //was_sys_low = is_sys_low; // Remove unused variable if (is_low) {