diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-06-12 10:31:27 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-06-12 10:31:27 -0700 |
| commit | d12c897bfc77a800fcec5e22a21c9d0344b0d0bc (patch) | |
| tree | 18752bdf92b12fce68642c94acec2d78b9c43fbe /indra/llrender/llshadermgr.cpp | |
| parent | 9775d7ea10ff87d913b1ba361a9204f961cd9c3f (diff) | |
| parent | f0de2ba6340e0d540aa70ac0086defde52cf60af (diff) | |
Merge remote-tracking branch 'origin/project/gltf_development' into brad/maint-a-merge-to-gltf-dev
# Conflicts:
# indra/newview/gltf/primitive.cpp
Diffstat (limited to 'indra/llrender/llshadermgr.cpp')
| -rw-r--r-- | indra/llrender/llshadermgr.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index c3cb015556..634be615e6 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -1178,7 +1178,13 @@ void LLShaderMgr::initAttribsAndUniforms() mReservedUniforms.push_back("texture_base_color_transform"); // (GLTF) mReservedUniforms.push_back("texture_normal_transform"); // (GLTF) mReservedUniforms.push_back("texture_metallic_roughness_transform"); // (GLTF) + mReservedUniforms.push_back("texture_occlusion_transform"); // (GLTF) mReservedUniforms.push_back("texture_emissive_transform"); // (GLTF) + mReservedUniforms.push_back("base_color_texcoord"); // (GLTF) + mReservedUniforms.push_back("emissive_texcoord"); // (GLTF) + mReservedUniforms.push_back("normal_texcoord"); // (GLTF) + mReservedUniforms.push_back("metallic_roughness_texcoord"); // (GLTF) + mReservedUniforms.push_back("occlusion_texcoord"); // (GLTF) mReservedUniforms.push_back("terrain_texture_transforms"); // (GLTF) |