Merge pull request #898 from KhronosGroup/fix-897

GLSL: Fix some complex cases for loading arrays