diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-10-29 23:02:20 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-10-29 23:02:20 +0100 |
| commit | 536799d07e4298ff8157ef51ed00040e10a5ba65 (patch) | |
| tree | 3f9322b25efd552a4d4b1c617b39b81136d1b084 /indra/llrender/llshadermgr.h | |
| parent | e9faa3cce8897af2a4303538672e2262ed39520a (diff) | |
SL-9977
SL-9973
Diffstat (limited to 'indra/llrender/llshadermgr.h')
| -rw-r--r-- | indra/llrender/llshadermgr.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llrender/llshadermgr.h b/indra/llrender/llshadermgr.h index af34c70c54..c22fe44750 100644 --- a/indra/llrender/llshadermgr.h +++ b/indra/llrender/llshadermgr.h @@ -241,10 +241,13 @@ public: HALO_MAP, MOON_BRIGHTNESS, - MOON_PHASE, CLOUD_VARIANCE, + SH_INPUT_L1R, + SH_INPUT_L1G, + SH_INPUT_L1B, + END_RESERVED_UNIFORMS } eGLSLReservedUniforms; @@ -255,6 +258,7 @@ public: BOOL attachShaderFeatures(LLGLSLShader * shader); void dumpObjectLog(GLhandleARB ret, BOOL warns = TRUE, const std::string& filename = ""); + void dumpShaderSource(U32 shader_code_count, GLcharARB** shader_code_text); BOOL linkProgramObject(GLhandleARB obj, BOOL suppress_errors = FALSE); BOOL validateProgramObject(GLhandleARB obj); GLhandleARB loadShaderFile(const std::string& filename, S32 & shader_level, GLenum type, boost::unordered_map<std::string, std::string>* defines = NULL, S32 texture_index_channels = -1); |