diff options
| author | Dave Parks <davep@lindenlab.com> | 2021-12-06 15:29:34 +0000 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2021-12-06 15:29:34 +0000 |
| commit | 5e5be92d79b6ad49f971e7b2f2ddd359d762c163 (patch) | |
| tree | 3ad8f7522a9087f7529b15d4cd0c9ab427ca49ae /indra/newview/llglsandbox.cpp | |
| parent | e7830b39f01d9f9c82e9e2029634dffb8386b24e (diff) | |
SL-16202 Put Multi-threaded GL behind a feature flag and update featuretable (decruftify settings, compatibility pass).
Diffstat (limited to 'indra/newview/llglsandbox.cpp')
| -rw-r--r-- | indra/newview/llglsandbox.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llglsandbox.cpp b/indra/newview/llglsandbox.cpp index 0b5064c77d..175f1849cf 100644 --- a/indra/newview/llglsandbox.cpp +++ b/indra/newview/llglsandbox.cpp @@ -1115,6 +1115,7 @@ F32 gpu_benchmark() // ensure matched pair of bind() and unbind() calls ShaderBinder binder(gBenchmarkProgram); +#ifdef GL_ARB_vertex_array_object U32 glarray = 0; if (LLRender::sGLCoreProfile) @@ -1122,6 +1123,7 @@ F32 gpu_benchmark() glGenVertexArrays(1, &glarray); glBindVertexArray(glarray); } +#endif buff->setBuffer(LLVertexBuffer::MAP_VERTEX); glFinish(); @@ -1155,11 +1157,13 @@ F32 gpu_benchmark() } } +#ifdef GL_ARB_vertex_array_object if (LLRender::sGLCoreProfile) { glBindVertexArray(0); glDeleteVertexArrays(1, &glarray); } +#endif std::sort(results.begin(), results.end()); |