livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NORSPEC-173 Shrink size of matrix palette for backwards compatibility.

meow-7.2.2
Dave Parks 2013-05-10 16:08:48 -05:00
parent d2f71df15f
commit efe8d75fe3
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl
View File

@ -26,7 +26,7 @@
ATTRIBUTE vec4 weight4;
uniform mat4 matrixPalette[64];
uniform mat4 matrixPalette[32];
mat4 getObjectSkinnedTransform()
{

8
indra/newview/lldrawpoolavatar.cpp
View File

@ -1587,9 +1587,11 @@ void LLDrawPoolAvatar::renderRigged(LLVOAvatar* avatar, U32 type, bool glow)
{
if (sShaderLevel > 0)
{ //upload matrix palette to shader
LLMatrix4 mat[64];
LLMatrix4 mat[32];
for (U32 i = 0; i < skin->mJointNames.size(); ++i)
U32 count = llmin(skin->mJointNames.size(), (U32) 32);
for (U32 i = 0; i < count; ++i)
{
LLJoint* joint = avatar->getJoint(skin->mJointNames[i]);
if (joint)
@ -1602,7 +1604,7 @@ void LLDrawPoolAvatar::renderRigged(LLVOAvatar* avatar, U32 type, bool glow)
stop_glerror();
LLDrawPoolAvatar::sVertexProgram->uniformMatrix4fv("matrixPalette",
skin->mJointNames.size(),
count,
FALSE,
(GLfloat*) mat[0].mMatrix);