diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2021-12-01 15:59:02 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2021-12-01 15:59:02 +0000 |
| commit | 3f82f7ce3d4fb51407f366b2ad2f15d990de40b2 (patch) | |
| tree | 45be0f3213f0e095d9a7929c693f4671c8b58e08 /indra/newview/llglsandbox.cpp | |
| parent | 01317a2faded53c79db7e0814426f1d8b2fd12fc (diff) | |
| parent | abd7d80048529fd971e1b65ea3afe0f7e78bd356 (diff) | |
Merged in euclid-pre-16386 (pull request #793)
Purge LLGLSLShader::sNoFixedFunction, and all that flows from it. No functional changes.
Approved-by: Michael Pohoreski
Approved-by: Dave Parks
Diffstat (limited to 'indra/newview/llglsandbox.cpp')
| -rw-r--r-- | indra/newview/llglsandbox.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/indra/newview/llglsandbox.cpp b/indra/newview/llglsandbox.cpp index 91f314c115..a135ef0814 100644 --- a/indra/newview/llglsandbox.cpp +++ b/indra/newview/llglsandbox.cpp @@ -791,10 +791,7 @@ void LLViewerObjectList::renderObjectBeacons() LLGLSUIDefault gls_ui; - if (LLGLSLShader::sNoFixedFunction) - { - gUIProgram.bind(); - } + gUIProgram.bind(); { gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE); @@ -882,10 +879,7 @@ void LLViewerObjectList::renderObjectBeacons() void LLSky::renderSunMoonBeacons(const LLVector3& pos_agent, const LLVector3& direction, LLColor4 color) { LLGLSUIDefault gls_ui; - if (LLGLSLShader::sNoFixedFunction) - { - gUIProgram.bind(); - } + gUIProgram.bind(); gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE); LLVector3 pos_end; |