diff options
| author | graham linden <graham@lindenlab.com> | 2013-03-05 13:42:57 -0800 |
|---|---|---|
| committer | graham linden <graham@lindenlab.com> | 2013-03-05 13:42:57 -0800 |
| commit | 046014aa10e535bfa18e3d7b4c2da70284a615ae (patch) | |
| tree | a2ddc78c2da49f22ae6c11195b0fbc5c27e32e5b /indra/llrender/llshadermgr.h | |
| parent | b19eeabd54afcfb56e864899c166b64db1ac6790 (diff) | |
| parent | a65c275865f1cc9bf53237e4b8c99a7bee3731ee (diff) | |
Merged lindenlab/viewer-cat into default
Diffstat (limited to 'indra/llrender/llshadermgr.h')
| -rw-r--r-- | indra/llrender/llshadermgr.h | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/indra/llrender/llshadermgr.h b/indra/llrender/llshadermgr.h index 7a16b7c20f..77e90372e0 100644 --- a/indra/llrender/llshadermgr.h +++ b/indra/llrender/llshadermgr.h @@ -47,6 +47,8 @@ public: TEXTURE_MATRIX1, TEXTURE_MATRIX2, TEXTURE_MATRIX3, + OBJECT_PLANE_S, + OBJECT_PLANE_T, VIEWPORT, LIGHT_POSITION, LIGHT_DIRECTION, @@ -164,7 +166,49 @@ public: DEFERRED_LIGHT, DEFERRED_BLOOM, DEFERRED_PROJECTION, + + AVATAR_MATRIX, + + WATER_SCREENTEX, + WATER_SCREENDEPTH, + WATER_REFTEX, + WATER_EYEVEC, + WATER_TIME, + WATER_WAVE_DIR1, + WATER_WAVE_DIR2, + WATER_LIGHT_DIR, + WATER_SPECULAR, + WATER_SPECULAR_EXP, + WATER_FOGCOLOR, + WATER_FOGDENSITY, + WATER_FOGKS, + WATER_REFSCALE, + WATER_WATERHEIGHT, + WATER_WATERPLANE, + WATER_NORM_SCALE, + WATER_FRESNEL_SCALE, + WATER_FRESNEL_OFFSET, + WATER_BLUR_MULTIPLIER, + WATER_SUN_ANGLE, + WATER_SCALED_ANGLE, + WATER_SUN_ANGLE2, + + WL_CAMPOSLOCAL, + + AVATAR_WIND, + AVATAR_SINWAVE, + AVATAR_GRAVITY, + + TERRAIN_DETAIL0, + TERRAIN_DETAIL1, + TERRAIN_DETAIL2, + TERRAIN_DETAIL3, + TERRAIN_ALPHARAMP, + + SHINY_ORIGIN, + END_RESERVED_UNIFORMS + } eGLSLReservedUniforms; // singleton pattern implementation |