diff options
| author | Erik Kundiman <erik@megapahit.org> | 2026-09-10 20:00:58 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2026-09-10 20:00:58 +0800 |
| commit | a13b37daa590b11d151dd65b7ddd97d3ef85e801 (patch) | |
| tree | 3a8f4a8b35682659e5c5be0ae414f6f2b2bb3f5d /indra/llrender | |
| parent | f2cd5728c3993a5fe6a5a5ff6e1a7072d03eab5f (diff) | |
| parent | 5b357a3a0f44af16512cd8bc35eaa30350bf72df (diff) | |
Merge branch 'main' into 26.4
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llvertexbuffer.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp index c61902cf83..8a73a68c54 100644 --- a/indra/llrender/llvertexbuffer.cpp +++ b/indra/llrender/llvertexbuffer.cpp @@ -951,14 +951,14 @@ void LLVertexBuffer::initClass(LLWindow* window) { llassert(sVBOPool == nullptr); -#if LL_DARWIN || LL_ARM64 +//#if LL_DARWIN || LL_ARM64 if (gGLManager.mIsApple) { LL_INFOS() << "VBO Pooling Disabled" << LL_ENDL; sVBOPool = new LLAppleVBOPool(); } else -#endif +//#endif { LL_INFOS() << "VBO Pooling Enabled" << LL_ENDL; sVBOPool = new LLDefaultVBOPool(); @@ -1296,12 +1296,12 @@ U8* LLVertexBuffer::mapVertexBuffer(LLVertexBuffer::AttributeType type, U32 inde count = mNumVerts - index; } -#if LL_DARWIN || LL_ARM64 +//#if LL_DARWIN || LL_ARM64 // Region tracking not needed on apple silicon - it recreates entire buffer // While mIsApple can be encountered under windows, this is a // macOS OpenGL behavior workaround. LL_ARM64 check might be not needed if (!gGLManager.mIsApple) -#endif +//#endif { U32 start = mOffsets[type] + sTypeSize[type] * index; U32 end = start + sTypeSize[type] * count-1; @@ -1338,9 +1338,9 @@ U8* LLVertexBuffer::mapIndexBuffer(U32 index, S32 count) count = mNumIndices-index; } -#if LL_DARWIN || LL_ARM64 +//#if LL_DARWIN || LL_ARM64 if (!gGLManager.mIsApple) -#endif +//#endif { U32 start = sizeof(U16) * index; U32 end = start + sizeof(U16) * count-1; @@ -1375,7 +1375,7 @@ U8* LLVertexBuffer::mapIndexBuffer(U32 index, S32 count) // dst -- mMappedData or mMappedIndexData void LLVertexBuffer::flush_vbo(GLenum target, U32 start, U32 end, void* data, U8* dst) { -#if LL_DARWIN || LL_ARM64 +//#if LL_DARWIN || LL_ARM64 if (gGLManager.mIsApple) { // on OS X, flush_vbo doesn't actually write to the GL buffer, so be sure to call @@ -1387,7 +1387,7 @@ void LLVertexBuffer::flush_vbo(GLenum target, U32 start, U32 end, void* data, U8 memcpy(dst+start, data, end-start+1); } else -#endif +//#endif { llassert(target == GL_ARRAY_BUFFER ? sGLRenderBuffer == mGLBuffer : sGLRenderIndices == mGLIndices); @@ -1442,7 +1442,7 @@ void LLVertexBuffer::_unmapBuffer() } }; -#if LL_DARWIN || LL_ARM64 +//#if LL_DARWIN || LL_ARM64 if (gGLManager.mIsApple) { STOP_GLERROR; @@ -1489,7 +1489,7 @@ void LLVertexBuffer::_unmapBuffer() STOP_GLERROR; } else -#endif // LL_DARWIN || LL_ARM64 +//#endif // LL_DARWIN || LL_ARM64 { if (!mMappedVertexRegions.empty()) { |