diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-04-02 18:06:37 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-04-02 18:06:37 +0000 |
| commit | d7b47bf71f84e4d7311a532b4bfa4a3795f19ab9 (patch) | |
| tree | 7bbe7116f4a6e53127286d8cb8dcf090f64915b2 /indra/llrender/llglslshader.h | |
| parent | 1199d139810f49de6052ceb90b4359042eb9a639 (diff) | |
| parent | 3a42d2b94a0f2d27b4baef63abaf49e64139ff01 (diff) | |
Merged in Geenz/viewer-eep (pull request #321)
[WIP] Use EXT_texture_sRGB_decode in order to selectively sample textures consumed by the deferred renderer as sRGB
Approved-by: Graham Madarasz <graham@lindenlab.com>
Diffstat (limited to 'indra/llrender/llglslshader.h')
| -rw-r--r-- | indra/llrender/llglslshader.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llrender/llglslshader.h b/indra/llrender/llglslshader.h index c1ce3d3aad..974d0ea005 100644 --- a/indra/llrender/llglslshader.h +++ b/indra/llrender/llglslshader.h @@ -153,8 +153,8 @@ public: //if given texture uniform is active in the shader, //the corresponding channel will be active upon return //returns channel texture is enabled in from [0-MAX) - S32 enableTexture(S32 uniform, LLTexUnit::eTextureType mode = LLTexUnit::TT_TEXTURE); - S32 disableTexture(S32 uniform, LLTexUnit::eTextureType mode = LLTexUnit::TT_TEXTURE); + S32 enableTexture(S32 uniform, LLTexUnit::eTextureType mode = LLTexUnit::TT_TEXTURE, LLTexUnit::eTextureColorSpace space = LLTexUnit::TCS_LINEAR); + S32 disableTexture(S32 uniform, LLTexUnit::eTextureType mode = LLTexUnit::TT_TEXTURE, LLTexUnit::eTextureColorSpace space = LLTexUnit::TCS_LINEAR); // bindTexture returns the texture unit we've bound the texture to. // You can reuse the return value to unbind a texture when required. |