diff options
| author | cosmic-linden <111533034+cosmic-linden@users.noreply.github.com> | 2024-10-14 13:42:03 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-14 13:42:03 -0700 |
| commit | a2899a3c6cc859dfde4d9692b0dde6e778184dc4 (patch) | |
| tree | 73aafb1cc89cdca2d90dffbfd19479168ac55a82 /indra/llrender/llglslshader.h | |
| parent | 1983342a0578a32a2a5f148514e708d3be27d13f (diff) | |
| parent | 07e33dfac78b170d235069fd035771016d3e0403 (diff) | |
Merge pull request #2823 from secondlife/v-1883
secondlife/viewer#1883: Terrain paint client prototype WIP code check-in
Diffstat (limited to 'indra/llrender/llglslshader.h')
| -rw-r--r-- | indra/llrender/llglslshader.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llrender/llglslshader.h b/indra/llrender/llglslshader.h index 2d669c70a9..c24daaf686 100644 --- a/indra/llrender/llglslshader.h +++ b/indra/llrender/llglslshader.h @@ -264,6 +264,8 @@ public: // You can reuse the return value to unbind a texture when required. S32 bindTexture(const std::string& uniform, LLTexture* texture, LLTexUnit::eTextureType mode = LLTexUnit::TT_TEXTURE); S32 bindTexture(S32 uniform, LLTexture* texture, LLTexUnit::eTextureType mode = LLTexUnit::TT_TEXTURE); + // For LLImageGL-wrapped textures created via GL elsewhere with our API only. Use with caution. + S32 bindTextureImageGL(S32 uniform, LLImageGL* texture, LLTexUnit::eTextureType mode = LLTexUnit::TT_TEXTURE); S32 bindTexture(const std::string& uniform, LLRenderTarget* texture, bool depth = false, LLTexUnit::eTextureFilterOptions mode = LLTexUnit::TFO_BILINEAR); S32 bindTexture(S32 uniform, LLRenderTarget* texture, bool depth = false, LLTexUnit::eTextureFilterOptions mode = LLTexUnit::TFO_BILINEAR, U32 index = 0); S32 unbindTexture(const std::string& uniform, LLTexUnit::eTextureType mode = LLTexUnit::TT_TEXTURE); |