diff options
| author | Howard Stearns <aech@lindenlab.com> | 2022-09-09 18:47:16 +0000 |
|---|---|---|
| committer | Howard Stearns <aech@lindenlab.com> | 2022-09-09 18:47:16 +0000 |
| commit | 765a99d238da80bcf705f58f8e8d6082050c0260 (patch) | |
| tree | 88de597a5cf75720f90a0d512fda89860c5a2e3e /indra/newview/llface.cpp | |
| parent | dfe19c257dbb9d5af6f1e2961015e95847525412 (diff) | |
| parent | c9565d6493887b1518465e8a666a75bbe9878f1d (diff) | |
Merged in SL-17967 (pull request #1113)
SL-17967 require 4.1 core profile
Diffstat (limited to 'indra/newview/llface.cpp')
| -rw-r--r-- | indra/newview/llface.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index f35b4b6d91..33d6a205e7 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -1224,7 +1224,7 @@ void LLFace::cacheFaceInVRAM(const LLVolumeFace& vf) mask |= LLVertexBuffer::MAP_WEIGHT4; } - LLVertexBuffer* buff = new LLVertexBuffer(mask, GL_STATIC_DRAW_ARB); + LLVertexBuffer* buff = new LLVertexBuffer(mask, GL_STATIC_DRAW); vf.mVertexBuffer = buff; buff->allocateBuffer(vf.mNumVertices, 0, true); @@ -1539,7 +1539,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume, #ifdef GL_TRANSFORM_FEEDBACK_BUFFER if (use_transform_feedback && - mVertexBuffer->getUsage() == GL_DYNAMIC_COPY_ARB && + mVertexBuffer->getUsage() == GL_DYNAMIC_COPY && gTransformPositionProgram.mProgramObject && //transform shaders are loaded mVertexBuffer->useVBOs() && //target buffer is in VRAM !rebuild_weights && //TODO: add support for weights @@ -1674,7 +1674,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume, } } - glBindBufferARB(GL_TRANSFORM_FEEDBACK_BUFFER, 0); + glBindBuffer(GL_TRANSFORM_FEEDBACK_BUFFER, 0); gGL.popMatrix(); if (cur_shader) |