summaryrefslogtreecommitdiff
path: root/indra/llrender
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2017-10-05 15:40:48 -0700
committerRider Linden <rider@lindenlab.com>2017-10-05 15:40:48 -0700
commite4b035d0cd3eaa76fd82643c17e3631c67387a54 (patch)
tree9147a9993aa7e5b33808fd31fca3950d0f2c950f /indra/llrender
parente97c52bdd3cfdf12c3eb2e423b193979de816f34 (diff)
Skys settings object active.
Diffstat (limited to 'indra/llrender')
-rw-r--r--indra/llrender/llshadermgr.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/llrender/llshadermgr.h b/indra/llrender/llshadermgr.h
index 394b38f832..7bdd97200d 100644
--- a/indra/llrender/llshadermgr.h
+++ b/indra/llrender/llshadermgr.h
@@ -30,6 +30,11 @@
#include "llgl.h"
#include "llglslshader.h"
+/*RIDER: TODO:
+ * This should use the LL Singleton<> template... but not a quick conversion.
+ * (llviewershadermgr derives from this)
+ */
+
class LLShaderMgr
{
public:
@@ -215,7 +220,7 @@ public:
TERRAIN_ALPHARAMP,
SHINY_ORIGIN,
-DISPLAY_GAMMA,
+ DISPLAY_GAMMA,
END_RESERVED_UNIFORMS
} eGLSLReservedUniforms;