diff options
| author | Runitai Linden <davep@lindenlab.com> | 2022-01-14 17:11:56 -0600 |
|---|---|---|
| committer | Runitai Linden <davep@lindenlab.com> | 2022-01-14 17:11:56 -0600 |
| commit | 0da2ab228961f1e50c830121c37cfa77c431a980 (patch) | |
| tree | 21dcb315293f5ac1c2e60d80669ac8590b095416 /indra/llrender/llrender.cpp | |
| parent | 6aa4d06cb6b728beac15773e9f08a02e375893ea (diff) | |
| parent | 559b162eec914d8e4f6f9f28a46184c9bcd51921 (diff) | |
Merge branch 'DRTVWR-546' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-546
Diffstat (limited to 'indra/llrender/llrender.cpp')
| -rw-r--r-- | indra/llrender/llrender.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp index 8b4f250894..3b46eef1b4 100644 --- a/indra/llrender/llrender.cpp +++ b/indra/llrender/llrender.cpp @@ -193,7 +193,7 @@ void LLTexUnit::bindFast(LLTexture* texture) bool LLTexUnit::bind(LLTexture* texture, bool for_rendering, bool forceBind) { - LL_PROFILE_ZONE_SCOPED; + LL_PROFILE_ZONE_SCOPED_CATEGORY_PIPELINE; stop_glerror(); if (mIndex >= 0) { @@ -1483,7 +1483,7 @@ LLLightState* LLRender::getLight(U32 index) void LLRender::setAmbientLightColor(const LLColor4& color) { - LL_PROFILE_ZONE_SCOPED + LL_PROFILE_ZONE_SCOPED_CATEGORY_PIPELINE if (color != mAmbientLightColor) { ++mLightHash; @@ -1558,7 +1558,7 @@ void LLRender::flush() { if (mCount > 0) { - LL_PROFILE_ZONE_SCOPED; + LL_PROFILE_ZONE_SCOPED_CATEGORY_PIPELINE; if (!mUIOffset.empty()) { sUICalls++; |