diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-17 17:32:28 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-17 17:32:28 -0400 |
| commit | 068c6d45099411d7827db3e50d9c91331fa5c189 (patch) | |
| tree | c46cce78e6db0d87c1d9b0da9229ea0cf1d727de /indra/llrender/llglslshader.h | |
| parent | 5e5be51edebf0fb6a59d4907c9fcaac1b1667ac4 (diff) | |
| parent | 806b11c5720e1bd9e9764fcfd896436b8385e8b2 (diff) | |
merge mesh branch changes (storm-1390)
Diffstat (limited to 'indra/llrender/llglslshader.h')
| -rw-r--r-- | indra/llrender/llglslshader.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llrender/llglslshader.h b/indra/llrender/llglslshader.h index d46ddbbe18..4922eb6d67 100644 --- a/indra/llrender/llglslshader.h +++ b/indra/llrender/llglslshader.h @@ -45,6 +45,8 @@ public: bool hasObjectSkinning; bool hasAtmospherics; bool hasGamma; + S32 mIndexedTextureChannels; + bool disableTextureIndex; // char numLights; @@ -64,6 +66,8 @@ public: LLGLSLShader(); + static GLhandleARB sCurBoundShader; + void unload(); BOOL createShader(std::vector<std::string> * attributes, std::vector<std::string> * uniforms); |