diff options
| author | cosmic-linden <111533034+cosmic-linden@users.noreply.github.com> | 2024-05-14 10:11:52 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-14 10:11:52 -0700 |
| commit | 193d9d5f767c2bfad1dc5ced4fa630d05ae798ae (patch) | |
| tree | cab4485b64288b3c52e26da8436c26a78c17e297 /indra/llrender | |
| parent | 942ff2cd8b0fe2787a9c0b85a4c61d853cd7d7dc (diff) | |
| parent | 87c889b370dc08a5a6b183621346e30b729ec51c (diff) | |
Merge pull request #1453 from secondlife/v-907
secondlife/viewer#907: Local PBR terrain texture transform in advanced settings
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llshadermgr.cpp | 4 | ||||
| -rw-r--r-- | indra/llrender/llshadermgr.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index 4e03882b7a..21541c8bc8 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -1179,7 +1179,9 @@ void LLShaderMgr::initAttribsAndUniforms() mReservedUniforms.push_back("texture_metallic_roughness_transform"); // (GLTF) mReservedUniforms.push_back("texture_emissive_transform"); // (GLTF) - llassert(mReservedUniforms.size() == LLShaderMgr::TEXTURE_EMISSIVE_TRANSFORM+1); + mReservedUniforms.push_back("terrain_texture_transforms"); // (GLTF) + + llassert(mReservedUniforms.size() == LLShaderMgr::TERRAIN_TEXTURE_TRANSFORMS +1); mReservedUniforms.push_back("viewport"); diff --git a/indra/llrender/llshadermgr.h b/indra/llrender/llshadermgr.h index 2f344c8105..3dfac3cf0a 100644 --- a/indra/llrender/llshadermgr.h +++ b/indra/llrender/llshadermgr.h @@ -58,6 +58,8 @@ public: TEXTURE_METALLIC_ROUGHNESS_TRANSFORM, // "texture_metallic_roughness_transform" (GLTF) TEXTURE_EMISSIVE_TRANSFORM, // "texture_emissive_transform" (GLTF) + TERRAIN_TEXTURE_TRANSFORMS, // "terrain_texture_transforms" (GLTF) + VIEWPORT, // "viewport" LIGHT_POSITION, // "light_position" LIGHT_DIRECTION, // "light_direction" |