SL-19279: LLGLSLShader::bindXXX is not free. Pack the uniforms

1 files changed, 6 insertions, 14 deletions

diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp
index c355115e8c..6fb319fd5b 100644
--- a/indra/llrender/llshadermgr.cpp
+++ b/indra/llrender/llshadermgr.cpp
@@ -1074,20 +1074,12 @@ void LLShaderMgr::initAttribsAndUniforms()
 	mReservedUniforms.push_back("object_plane_s");
 	mReservedUniforms.push_back("object_plane_t");
 
-    mReservedUniforms.push_back("texture_base_color_scale"); // (GLTF)
-    mReservedUniforms.push_back("texture_base_color_rotation"); // (GLTF)
-    mReservedUniforms.push_back("texture_base_color_offset"); // (GLTF)
-    mReservedUniforms.push_back("texture_normal_scale"); // (GLTF)
-    mReservedUniforms.push_back("texture_normal_rotation"); // (GLTF)
-    mReservedUniforms.push_back("texture_normal_offset"); // (GLTF)
-    mReservedUniforms.push_back("texture_metallic_roughness_scale"); // (GLTF)
-    mReservedUniforms.push_back("texture_metallic_roughness_rotation"); // (GLTF)
-    mReservedUniforms.push_back("texture_metallic_roughness_offset"); // (GLTF)
-    mReservedUniforms.push_back("texture_emissive_scale"); // (GLTF)
-    mReservedUniforms.push_back("texture_emissive_rotation"); // (GLTF)
-    mReservedUniforms.push_back("texture_emissive_offset"); // (GLTF)
-
-    llassert(mReservedUniforms.size() == LLShaderMgr::TEXTURE_EMISSIVE_OFFSET+1);
+    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_emissive_transform"); // (GLTF)
+
+    llassert(mReservedUniforms.size() == LLShaderMgr::TEXTURE_EMISSIVE_TRANSFORM+1);
 
 	mReservedUniforms.push_back("viewport");