Skip to content
Snippets Groups Projects
Commit 42735f0d authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

These timers create hot spots due to how many times they are called in one frame

parent fd9a6caf
No related branches found
No related tags found
No related merge requests found
...@@ -147,7 +147,7 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, const LLRectf& rec ...@@ -147,7 +147,7 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, const LLRectf& rec
S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, const LLColor4 &color, HAlign halign, VAlign valign, U8 style, S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, const LLColor4 &color, HAlign halign, VAlign valign, U8 style,
ShadowType shadow, S32 max_chars, S32 max_pixels, F32* right_x, BOOL use_ellipses) const ShadowType shadow, S32 max_chars, S32 max_pixels, F32* right_x, BOOL use_ellipses) const
{ {
LL_RECORD_BLOCK_TIME(FTM_RENDER_FONTS); //LL_RECORD_BLOCK_TIME(FTM_RENDER_FONTS);
if(!sDisplayFont) //do not display texts if(!sDisplayFont) //do not display texts
{ {
......
...@@ -569,7 +569,7 @@ void LLVertexBuffer::setupClientArrays(U32 data_mask) ...@@ -569,7 +569,7 @@ void LLVertexBuffer::setupClientArrays(U32 data_mask)
static LLTrace::BlockTimerStatHandle FTM_VB_DRAW_ARRAYS("drawArrays"); static LLTrace::BlockTimerStatHandle FTM_VB_DRAW_ARRAYS("drawArrays");
void LLVertexBuffer::drawArrays(U32 mode, const std::vector<LLVector3>& pos, const std::vector<LLVector3>& norm) void LLVertexBuffer::drawArrays(U32 mode, const std::vector<LLVector3>& pos, const std::vector<LLVector3>& norm)
{ {
LL_RECORD_BLOCK_TIME(FTM_VB_DRAW_ARRAYS); //LL_RECORD_BLOCK_TIME(FTM_VB_DRAW_ARRAYS);
llassert(!LLGLSLShader::sNoFixedFunction || LLGLSLShader::sCurBoundShaderPtr != NULL); llassert(!LLGLSLShader::sNoFixedFunction || LLGLSLShader::sCurBoundShaderPtr != NULL);
gGL.syncMatrices(); gGL.syncMatrices();
...@@ -857,7 +857,7 @@ void LLVertexBuffer::drawArrays(U32 mode, U32 first, U32 count) const ...@@ -857,7 +857,7 @@ void LLVertexBuffer::drawArrays(U32 mode, U32 first, U32 count) const
} }
{ {
LL_RECORD_BLOCK_TIME(FTM_GL_DRAW_ARRAYS); //LL_RECORD_BLOCK_TIME(FTM_GL_DRAW_ARRAYS);
stop_glerror(); stop_glerror();
LLGLSLShader::startProfile(); LLGLSLShader::startProfile();
stop_glerror(); stop_glerror();
...@@ -2220,7 +2220,7 @@ bool LLVertexBuffer::bindGLArray() ...@@ -2220,7 +2220,7 @@ bool LLVertexBuffer::bindGLArray()
if (mGLArray && sGLRenderArray != mGLArray) if (mGLArray && sGLRenderArray != mGLArray)
{ {
{ {
LL_RECORD_BLOCK_TIME(FTM_BIND_GL_ARRAY); //LL_RECORD_BLOCK_TIME(FTM_BIND_GL_ARRAY);
#if GL_ARB_vertex_array_object #if GL_ARB_vertex_array_object
glBindVertexArray(mGLArray); glBindVertexArray(mGLArray);
#endif #endif
...@@ -2271,7 +2271,7 @@ bool LLVertexBuffer::bindGLIndices(bool force_bind) ...@@ -2271,7 +2271,7 @@ bool LLVertexBuffer::bindGLIndices(bool force_bind)
bool ret = false; bool ret = false;
if (useVBOs() && (force_bind || (mGLIndices && (mGLIndices != sGLRenderIndices || !sIBOActive)))) if (useVBOs() && (force_bind || (mGLIndices && (mGLIndices != sGLRenderIndices || !sIBOActive))))
{ {
LL_RECORD_BLOCK_TIME(FTM_BIND_GL_INDICES); //LL_RECORD_BLOCK_TIME(FTM_BIND_GL_INDICES);
/*if (sMapped) /*if (sMapped)
{ {
LL_ERRS() << "VBO bound while another VBO mapped!" << LL_ENDL; LL_ERRS() << "VBO bound while another VBO mapped!" << LL_ENDL;
......
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