diff options
author | Graham Linden <graham@lindenlab.com> | 2019-03-13 13:21:48 -0700 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2019-03-13 13:21:48 -0700 |
commit | 898c9f44218353b3bf71b78ffce02662b4927625 (patch) | |
tree | 2793682ba7d69d34730a4aeced04100312a479a2 /indra/llrender/llgl.cpp | |
parent | 868cd32e5e229e503f1b5b1d5ec543fd6f76cb7f (diff) |
Mods to make merge with viewer-release have less whitespace-only change and fix diffs between EEP and VR.
Diffstat (limited to 'indra/llrender/llgl.cpp')
-rw-r--r-- | indra/llrender/llgl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp index b6300578e6..54a41c9d23 100644 --- a/indra/llrender/llgl.cpp +++ b/indra/llrender/llgl.cpp @@ -1353,8 +1353,8 @@ void LLGLManager::initExtensions() // nSight doesn't support use of ARB funcs that have been normalized in the API if (!LLRender::sNsightDebugSupport) { - glGetAttribLocationARB = (PFNGLGETATTRIBLOCATIONARBPROC) GLH_EXT_GET_PROC_ADDRESS("glGetAttribLocationARB"); - glBindAttribLocationARB = (PFNGLBINDATTRIBLOCATIONARBPROC) GLH_EXT_GET_PROC_ADDRESS("glBindAttribLocationARB"); + glGetAttribLocationARB = (PFNGLGETATTRIBLOCATIONARBPROC) GLH_EXT_GET_PROC_ADDRESS("glGetAttribLocationARB"); + glBindAttribLocationARB = (PFNGLBINDATTRIBLOCATIONARBPROC) GLH_EXT_GET_PROC_ADDRESS("glBindAttribLocationARB"); } else { |