diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-12-17 14:39:40 -0800 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-12-17 14:39:40 -0800 |
| commit | 765ad6bb7e65dc66032d0ac45e7386f995167db7 (patch) | |
| tree | 530112a72d81480ffa23a6989cdf8b109951d6de /indra/newview/llviewershadermgr.h | |
| parent | 634910f685057c50ae3233d9f71d4b21cf958749 (diff) | |
| parent | cdc540a5c4d03b567e787b0599575693e95fac5f (diff) | |
Merge
Diffstat (limited to 'indra/newview/llviewershadermgr.h')
| -rw-r--r-- | indra/newview/llviewershadermgr.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewershadermgr.h b/indra/newview/llviewershadermgr.h index 250f8f1ee3..ac2cfc1160 100644 --- a/indra/newview/llviewershadermgr.h +++ b/indra/newview/llviewershadermgr.h @@ -48,7 +48,7 @@ public: void initAttribsAndUniforms(void); void setShaders(); void unloadShaders(); - S32 getVertexShaderLevel(S32 type); + S32 getShaderLevel(S32 type); BOOL loadBasicShaders(); BOOL loadShadersEffects(); BOOL loadShadersDeferred(); @@ -60,7 +60,7 @@ public: BOOL loadShadersWindLight(); BOOL loadTransformShaders(); - std::vector<S32> mVertexShaderLevel; + std::vector<S32> mShaderLevel; S32 mMaxAvatarShaderLevel; enum EShaderClass |