diff options
| author | Jonathan Goodman <geenz@geenzo.com> | 2012-08-28 10:33:32 -0400 |
|---|---|---|
| committer | Jonathan Goodman <geenz@geenzo.com> | 2012-08-28 10:33:32 -0400 |
| commit | ed1b78e32235680c3978b9830e5ba81115a0ab7d (patch) | |
| tree | 4b247e72515c88842cfc0e841c3cecfb17b050ec /indra/llrender/llglslshader.h | |
| parent | e51a57b895895e3a3a613022b973067fd17d9561 (diff) | |
Added support for adding custom preprocessor definitions (for shader permutations)
Diffstat (limited to 'indra/llrender/llglslshader.h')
| -rw-r--r-- | indra/llrender/llglslshader.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llrender/llglslshader.h b/indra/llrender/llglslshader.h index 5c68cb46eb..bee5d9adda 100644 --- a/indra/llrender/llglslshader.h +++ b/indra/llrender/llglslshader.h @@ -123,6 +123,8 @@ public: GLint getAttribLocation(U32 attrib); GLint mapUniformTextureChannel(GLint location, GLenum type); + void addPermutation(std::string name, std::string value); + //enable/disable texture channel for specified uniform //if given texture uniform is active in the shader, //the corresponding channel will be active upon return @@ -153,6 +155,7 @@ public: LLShaderFeatures mFeatures; std::vector< std::pair< std::string, GLenum > > mShaderFiles; std::string mName; + std::map<std::string, std::string> mDefines; }; //UI shader (declared here so llui_libtest will link properly) |