diff options
| author | Runitai Linden <davep@lindenlab.com> | 2021-09-22 16:50:20 -0500 |
|---|---|---|
| committer | Runitai Linden <davep@lindenlab.com> | 2021-09-22 16:50:20 -0500 |
| commit | 9cff7ebc0cf7850b603ef4a4fb1435f72b678735 (patch) | |
| tree | cd3c2a86f38f5d218e253e17b0c32e0b9603cf8d /indra/newview/llface.cpp | |
| parent | b4bb74c5def3175d99d672b0b26f941b756f5f45 (diff) | |
| parent | b1c32db37f74de715b4d6f9e98653f482e05df51 (diff) | |
Merge remote-tracking branch 'remotes/origin/DRTVWR-541' into DRTVWR-546
# Conflicts:
# indra/llcommon/linden_common.h
Diffstat (limited to 'indra/newview/llface.cpp')
| -rw-r--r-- | indra/newview/llface.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index 4a802ad9aa..6e55d8f66a 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -585,6 +585,7 @@ void LLFace::renderSelected(LLViewerTexture *imagep, const LLColor4& color) glTexCoordPointer(2, GL_FLOAT, 8, vol_face.mTexCoords); } gGL.syncMatrices(); + LL_PROFILER_GPU_ZONEC( "gl.DrawElements", 0x00FF00 ); glDrawElements(GL_TRIANGLES, vol_face.mNumIndices, GL_UNSIGNED_SHORT, vol_face.mIndices); glDisableClientState(GL_TEXTURE_COORD_ARRAY); } |