Merge pull request #2271 from ben-clayton/fold-hlsl