diff options
| author | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2023-04-12 15:18:27 -0700 |
|---|---|---|
| committer | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2023-04-12 15:18:27 -0700 |
| commit | 6d5c16971654764de28833fd886f522212d3746d (patch) | |
| tree | 977b913112505d09966133857c9a92fd07629431 /indra/llrender | |
| parent | 58df456675f37146d9a6cdaaf75c0f2b93f234c6 (diff) | |
| parent | d6b99cff8ab7550b5e0316c831087050f19c91c6 (diff) | |
Merge branch 'DRTVWR-559' into DRTVWR-559-post-refactor
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llglslshader.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp index d213aa05ed..b12de563e4 100644 --- a/indra/llrender/llglslshader.cpp +++ b/indra/llrender/llglslshader.cpp @@ -1098,8 +1098,13 @@ S32 LLGLSLShader::bindTexture(S32 uniform, LLRenderTarget* texture, bool depth, if (uniform > -1) { - gGL.getTexUnit(uniform)->bind(texture, depth); - + if (depth) { + gGL.getTexUnit(uniform)->bind(texture, true); + } + else { + bool has_mips = mode == LLTexUnit::TFO_TRILINEAR || mode == LLTexUnit::TFO_ANISOTROPIC; + gGL.getTexUnit(uniform)->bindManual(texture->getUsage(), texture->getTexture(0), has_mips); + } gGL.getTexUnit(uniform)->setTextureFilteringOption(mode); } |