diff options
| author | Dave Parks <davep@lindenlab.com> | 2024-06-10 10:43:38 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-10 10:43:38 -0500 |
| commit | 227e9be06832515fd10eb496d4a2a4528d1ebd92 (patch) | |
| tree | dfe366ee3ea6c4fe4b08dc080fd07313e279a7d5 /indra/llrender/llshadermgr.cpp | |
| parent | 33ddedd6b557ed9130dd8cd3b8327a697614a3ac (diff) | |
#1654 generate normals and tangents according to gltf specification (#1662)
* Disable unloading of objects in background.
* Add unlit GLTF shader variant
Diffstat (limited to 'indra/llrender/llshadermgr.cpp')
| -rw-r--r-- | indra/llrender/llshadermgr.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index 4e8adb2fb3..4d53df5f06 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -1157,6 +1157,7 @@ void LLShaderMgr::initAttribsAndUniforms() mReservedAttribs.push_back("weight"); mReservedAttribs.push_back("weight4"); mReservedAttribs.push_back("clothing"); + mReservedAttribs.push_back("joint"); mReservedAttribs.push_back("texture_index"); //matrix state @@ -1239,7 +1240,6 @@ void LLShaderMgr::initAttribsAndUniforms() mReservedUniforms.push_back("heroProbes"); mReservedUniforms.push_back("cloud_noise_texture"); mReservedUniforms.push_back("cloud_noise_texture_next"); - mReservedUniforms.push_back("fullbright"); mReservedUniforms.push_back("lightnorm"); mReservedUniforms.push_back("sunlight_color"); mReservedUniforms.push_back("ambient_color"); @@ -1363,7 +1363,6 @@ void LLShaderMgr::initAttribsAndUniforms() mReservedUniforms.push_back("bloomMap"); mReservedUniforms.push_back("projectionMap"); mReservedUniforms.push_back("norm_mat"); - mReservedUniforms.push_back("texture_gamma"); mReservedUniforms.push_back("specular_color"); mReservedUniforms.push_back("env_intensity"); |