diff options
author | simon <none@none> | 2014-12-02 10:41:20 -0800 |
---|---|---|
committer | simon <none@none> | 2014-12-02 10:41:20 -0800 |
commit | 4f076daeff1bb626bb90a57cbe91660349ec62f1 (patch) | |
tree | f3f09166aa11060ba16847277201c55d0664c181 /indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl | |
parent | 47423ad1a0d349f263ab1c2f0ceca299e418bbbc (diff) | |
parent | 147d1922450f289fe675dc6f0ccce9094db13b38 (diff) |
Merge downstream code and become 3.7.22
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl')
-rwxr-xr-x | indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl b/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl index 57129c3bd1..6cd38d8ef5 100755 --- a/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl +++ b/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl @@ -63,5 +63,14 @@ mat4 getObjectSkinnedTransform() ret[3] = vec4(trans, 1.0); return ret; + +#ifdef IS_AMD_CARD + // If it's AMD make sure the GLSL compiler sees the arrays referenced once by static index. Otherwise it seems to optimise the storage awawy which leads to unfun crashes and artifacts. + mat3 dummy1 = matrixPalette[0]; + vec3 dummy2 = translationPalette[0]; + mat3 dummy3 = matrixPalette[51]; + vec3 dummy4 = translationPalette[51]; +#endif + } |