Merge pull request #1732 from KhronosGroup/fix-1731

Fix switch fallthrough case in some cases.