diff options
| author | Jonathan Goodman <geenz@lindenlab.com> | 2022-10-10 15:19:58 +0000 |
|---|---|---|
| committer | Jonathan Goodman <geenz@lindenlab.com> | 2022-10-10 15:19:58 +0000 |
| commit | 5c65f58cb8c6a0065c2aaa7c4e7286124203f241 (patch) | |
| tree | ed8934f91cbbcd1591bf79bd46eef9b0b847500b /indra/llrender/llvertexbuffer.cpp | |
| parent | ace892b8f5b12f4c85aec70caa032a13f8d0fd2c (diff) | |
| parent | 7ff19ec98c25c6ad17b979078e77ec2cab9f7ebd (diff) | |
Merged in SL-18290 (pull request #1151)
SL-18290
Approved-by: Dave Parks
Diffstat (limited to 'indra/llrender/llvertexbuffer.cpp')
| -rw-r--r-- | indra/llrender/llvertexbuffer.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp index 981175d845..33dcd6c563 100644 --- a/indra/llrender/llvertexbuffer.cpp +++ b/indra/llrender/llvertexbuffer.cpp @@ -175,7 +175,7 @@ U8* LLVBOPool::allocate(U32& name, U32 size, bool for_seed) { //make a new buffer name = genBuffer(); - + glBindBuffer(mType, name); if (!for_seed && i < LL_VBO_POOL_SEED_COUNT) @@ -574,6 +574,12 @@ void LLVertexBuffer::validateRange(U32 start, U32 end, U32 count, U32 indices_of } } +#ifdef LL_PROFILER_ENABLE_TRACY_OPENGL +void LLVertexBuffer::setLabel(const char* label) { + LL_LABEL_OBJECT_GL(GL_BUFFER, mGLBuffer, strlen(label), label); +} +#endif + void LLVertexBuffer::drawRange(U32 mode, U32 start, U32 end, U32 count, U32 indices_offset) const { validateRange(start, end, count, indices_offset); @@ -1068,6 +1074,7 @@ bool LLVertexBuffer::createGLBuffer(U32 size) { static int gl_buffer_idx = 0; mGLBuffer = ++gl_buffer_idx; + mMappedData = (U8*)ll_aligned_malloc_16(size); mSize = size; } |