diff options
author | Rider Linden <rider@lindenlab.com> | 2019-03-07 15:26:41 -0800 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2019-03-07 15:26:41 -0800 |
commit | a237325ad64d0930340e2a6f82d4042797ed8e68 (patch) | |
tree | 3259746274acc6a0fc29f29a897271ea199d9381 /indra/llrender/llglslshader.h | |
parent | 8740c54fb074b8ab2349dc5a3317e1578de3d812 (diff) | |
parent | 2d8152afd9c6077b5eda8d139521a4e3c1328775 (diff) |
Merge
Diffstat (limited to 'indra/llrender/llglslshader.h')
-rw-r--r-- | indra/llrender/llglslshader.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llrender/llglslshader.h b/indra/llrender/llglslshader.h index c06668eb43..e5110fe1c4 100644 --- a/indra/llrender/llglslshader.h +++ b/indra/llrender/llglslshader.h @@ -145,6 +145,7 @@ public: GLint getAttribLocation(U32 attrib); GLint mapUniformTextureChannel(GLint location, GLenum type); + void clearPermutations(); void addPermutation(std::string name, std::string value); void removePermutation(std::string name); |