diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-06-17 12:45:58 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-06-17 12:45:58 -0500 |
| commit | d67dbf3c99179cae7e2b9c90ba4ad995b893403c (patch) | |
| tree | f33526bb4c49305e8f112d5a983ceff85dc9f94a | |
| parent | 74817f151f3e5c2c0c179d13d1100974ed78fbd4 (diff) | |
| parent | fa7d983f087fd2ec1393b6f9fcd57cf4e7225e37 (diff) | |
merge
| -rw-r--r-- | indra/llcommon/llfasttimer_class.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/llface.cpp | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/indra/llcommon/llfasttimer_class.cpp b/indra/llcommon/llfasttimer_class.cpp index 20727dd76e..dfbae09864 100644 --- a/indra/llcommon/llfasttimer_class.cpp +++ b/indra/llcommon/llfasttimer_class.cpp @@ -238,7 +238,8 @@ U64 LLFastTimer::countsPerSecond() // counts per second for the *32-bit* timer #else // windows or x86-mac or x86-linux or x86-solaris U64 LLFastTimer::countsPerSecond() // counts per second for the *32-bit* timer { - static U64 sCPUClockFrequency = U64(LLProcessorInfo().getCPUFrequency()); + //getCPUFrequency returns MHz and sCPUClockFrequency wants to be in Hz + static U64 sCPUClockFrequency = U64(LLProcessorInfo().getCPUFrequency()*1000000.0); // we drop the low-order byte in our timers, so report a lower frequency return sCPUClockFrequency >> 8; diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index e0e5b32299..3f9db4831f 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -862,11 +862,14 @@ void LLFace::updateRebuildFlags() } } +static LLFastTimer::DeclareTimer FTM_FACE_GET_GEOM("Face Geom");
+ BOOL LLFace::getGeometryVolume(const LLVolume& volume, const S32 &f, const LLMatrix4& mat_vert, const LLMatrix3& mat_normal, const U16 &index_offset) { + LLFastTimer t(FTM_FACE_GET_GEOM); const LLVolumeFace &vf = volume.getVolumeFace(f); S32 num_vertices = (S32)vf.mVertices.size(); S32 num_indices = LLPipeline::sUseTriStrips ? (S32)vf.mTriStrip.size() : (S32) vf.mIndices.size(); |