diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2018-02-16 20:52:10 +0000 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2018-02-16 20:52:10 +0000 |
| commit | 5efc817d9a76fe0b169b831393d794fc2257261b (patch) | |
| tree | 6bdfe387970573748d66453cbe466fe356501305 /indra/llwindow | |
| parent | b2f61c0e0b27b9c1dae33a85bfc4db6b3ce95dc0 (diff) | |
| parent | caa60a57310a01041cca74be789935ae6135f4eb (diff) | |
Merged in graham_linden/viewer-neko (pull request #525)
Fixes MAINT-8282 feature req (from me :) )
Add debug setting and code to allow nVidia nSight graphics debugging to capture SL frames.
Approved-by: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Approved-by: Andrey Lihatskiy <andreylproductengine@lindenlab.com>
Approved-by: Ruslan Teliuk <ruslantproductengine@lindenlab.com>
Diffstat (limited to 'indra/llwindow')
| -rw-r--r-- | indra/llwindow/llwindowwin32.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp index 38f8989797..6e3aba51cf 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -1549,7 +1549,10 @@ BOOL LLWindowWin32::switchContext(BOOL fullscreen, const LLCoordScreen &size, BO (LLRender::sGLCoreProfile ? " core" : " compatibility") << " context." << LL_ENDL; done = true; - if (LLRender::sGLCoreProfile) + // force sNoFixedFunction iff we're trying to use nsight debugging which does not support many legacy API uses + + // nSight doesn't support use of legacy API funcs in the fixed function pipe + if (LLRender::sGLCoreProfile || LLRender::sNsightDebugSupport) { LLGLSLShader::sNoFixedFunction = true; } |