diff --git a/indra/newview/llviewerpartsim.cpp b/indra/newview/llviewerpartsim.cpp index 34807a1819..a9713258e5 100644 --- a/indra/newview/llviewerpartsim.cpp +++ b/indra/newview/llviewerpartsim.cpp @@ -472,15 +472,44 @@ void LLViewerPartGroup::removeParticlesByID(const U32 source_id) //static void LLViewerPartSim::checkParticleCount(U32 size) { + // FIRE-34600 - bugsplat AVX2 particle count mismatch + // if(LLViewerPartSim::sParticleCount2 != LLViewerPartSim::sParticleCount) + // { + // LL_ERRS() << "sParticleCount: " << LLViewerPartSim::sParticleCount << " ; sParticleCount2: " << LLViewerPartSim::sParticleCount2 << LL_ENDL ; + // } + // + // if(size > (U32)LLViewerPartSim::sParticleCount2) + // { + // LL_ERRS() << "current particle size: " << LLViewerPartSim::sParticleCount2 << " array size: " << size << LL_ENDL ; // FIRE-34600 - bugsplat AVX2 particle count mismatch + // } if(LLViewerPartSim::sParticleCount2 != LLViewerPartSim::sParticleCount) { - LL_ERRS() << "sParticleCount: " << LLViewerPartSim::sParticleCount << " ; sParticleCount2: " << LLViewerPartSim::sParticleCount2 << LL_ENDL ; + static int fail_count{0}; + if(fail_count > 10) + { + LL_ERRS() << "sParticleCount: " << LLViewerPartSim::sParticleCount << " ; sParticleCount2: " << LLViewerPartSim::sParticleCount2 << LL_ENDL ; + } + else + { + LL_WARNS() << "sParticleCount: " << LLViewerPartSim::sParticleCount << " ; sParticleCount2: " << LLViewerPartSim::sParticleCount2 << LL_ENDL ; + } + fail_count++; } if(size > (U32)LLViewerPartSim::sParticleCount2) { - LL_ERRS() << "current particle size: " << LLViewerPartSim::sParticleCount2 << " array size: " << size << LL_ENDL ; // FIRE-34600 - bugsplat AVX2 particle count mismatch + static int size_mismatch_count{0}; + if(size_mismatch_count > 10) + { + LL_ERRS() << "current particle size: " << LLViewerPartSim::sParticleCount2 << " array size: " << size << LL_ENDL ; + } + else + { + LL_WARNS() << "current particle size: " << LLViewerPartSim::sParticleCount2 << " array size: " << size << LL_ENDL ; + } + size_mismatch_count++; } + // } LLViewerPartSim::LLViewerPartSim()