summaryrefslogtreecommitdiff
path: root/indra/llrender/llshadermgr.h
diff options
context:
space:
mode:
authorCosmic Linden <cosmic@lindenlab.com>2023-02-27 15:57:45 -0800
committerCosmic Linden <cosmic@lindenlab.com>2023-02-27 15:57:45 -0800
commitb27c41578b4bb54ee87fbb8d05f29d9d9a9e2768 (patch)
tree9ddf9eed75fa11dfe1e6308647cf10b04c845f54 /indra/llrender/llshadermgr.h
parent099fe4a70a95339c1709c3eb2a925d7a77c642cc (diff)
SL-19279: LLGLSLShader::bindXXX is not free. Pack the uniforms
Diffstat (limited to 'indra/llrender/llshadermgr.h')
-rw-r--r--indra/llrender/llshadermgr.h16
1 files changed, 4 insertions, 12 deletions
diff --git a/indra/llrender/llshadermgr.h b/indra/llrender/llshadermgr.h
index f7439a65af..93ea49d16a 100644
--- a/indra/llrender/llshadermgr.h
+++ b/indra/llrender/llshadermgr.h
@@ -53,18 +53,10 @@ public:
OBJECT_PLANE_S, // "object_plane_s"
OBJECT_PLANE_T, // "object_plane_t"
- TEXTURE_BASE_COLOR_SCALE, // "texture_base_color_scale" (GLTF)
- TEXTURE_BASE_COLOR_ROTATION, // "texture_base_color_rotation" (GLTF)
- TEXTURE_BASE_COLOR_OFFSET, // "texture_base_color_offset" (GLTF)
- TEXTURE_NORMAL_SCALE, // "texture_normal_scale" (GLTF)
- TEXTURE_NORMAL_ROTATION, // "texture_normal_rotation" (GLTF)
- TEXTURE_NORMAL_OFFSET, // "texture_normal_offset" (GLTF)
- TEXTURE_METALLIC_ROUGHNESS_SCALE, // "texture_metallic_roughness_scale" (GLTF)
- TEXTURE_METALLIC_ROUGHNESS_ROTATION,// "texture_metallic_roughness_rotation" (GLTF)
- TEXTURE_METALLIC_ROUGHNESS_OFFSET, // "texture_metallic_roughness_offset" (GLTF)
- TEXTURE_EMISSIVE_SCALE, // "texture_emissive_scale" (GLTF)
- TEXTURE_EMISSIVE_ROTATION, // "texture_emissive_rotation" (GLTF)
- TEXTURE_EMISSIVE_OFFSET, // "texture_emissive_offset" (GLTF)
+ TEXTURE_BASE_COLOR_TRANSFORM, // "texture_base_color_transform" (GLTF)
+ TEXTURE_NORMAL_TRANSFORM, // "texture_normal_transform" (GLTF)
+ TEXTURE_METALLIC_ROUGHNESS_TRANSFORM, // "texture_metallic_roughness_transform" (GLTF)
+ TEXTURE_EMISSIVE_TRANSFORM, // "texture_emissive_transform" (GLTF)
VIEWPORT, // "viewport"
LIGHT_POSITION, // "light_position"