Skip to content
Snippets Groups Projects
Commit d67dbf3c authored by David Parks's avatar David Parks
Browse files

merge

parents 74817f15 fa7d983f
No related branches found
No related tags found
No related merge requests found
...@@ -238,7 +238,8 @@ U64 LLFastTimer::countsPerSecond() // counts per second for the *32-bit* timer ...@@ -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 #else // windows or x86-mac or x86-linux or x86-solaris
U64 LLFastTimer::countsPerSecond() // counts per second for the *32-bit* timer 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 // we drop the low-order byte in our timers, so report a lower frequency
return sCPUClockFrequency >> 8; return sCPUClockFrequency >> 8;
......
...@@ -862,11 +862,14 @@ void LLFace::updateRebuildFlags() ...@@ -862,11 +862,14 @@ void LLFace::updateRebuildFlags()
} }
} }
static LLFastTimer::DeclareTimer FTM_FACE_GET_GEOM("Face Geom");
BOOL LLFace::getGeometryVolume(const LLVolume& volume, BOOL LLFace::getGeometryVolume(const LLVolume& volume,
const S32 &f, const S32 &f,
const LLMatrix4& mat_vert, const LLMatrix3& mat_normal, const LLMatrix4& mat_vert, const LLMatrix3& mat_normal,
const U16 &index_offset) const U16 &index_offset)
{ {
LLFastTimer t(FTM_FACE_GET_GEOM);
const LLVolumeFace &vf = volume.getVolumeFace(f); const LLVolumeFace &vf = volume.getVolumeFace(f);
S32 num_vertices = (S32)vf.mVertices.size(); S32 num_vertices = (S32)vf.mVertices.size();
S32 num_indices = LLPipeline::sUseTriStrips ? (S32)vf.mTriStrip.size() : (S32) vf.mIndices.size(); S32 num_indices = LLPipeline::sUseTriStrips ? (S32)vf.mTriStrip.size() : (S32) vf.mIndices.size();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment