diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-03-04 18:06:29 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-03-04 18:06:29 -0600 |
| commit | 586025bde53ffcd160a9d169cca328ed5078f5f4 (patch) | |
| tree | 1f59d27d08567fd5f3fe02ce42fe6bae37bd3b2c /indra/llrender/llrender.cpp | |
| parent | 3ee3c3ced32bd1e67a6bea51341734c8764df018 (diff) | |
| parent | 609ed855e1160505238378a1be49e2b92e8496f5 (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
Diffstat (limited to 'indra/llrender/llrender.cpp')
| -rw-r--r-- | indra/llrender/llrender.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp index 5801946a74..14962fe58e 100644 --- a/indra/llrender/llrender.cpp +++ b/indra/llrender/llrender.cpp @@ -1070,6 +1070,16 @@ LLRender::~LLRender() void LLRender::init() { + if (sGLCoreProfile && !LLVertexBuffer::sUseVAO) + { //bind a dummy vertex array object so we're core profile compliant +#ifdef GL_ARB_vertex_array_object + U32 ret; + glGenVertexArrays(1, &ret); + glBindVertexArray(ret); +#endif + } + + llassert_always(mBuffer.isNull()) ; stop_glerror(); mBuffer = new LLVertexBuffer(immediate_mask, 0); |