Merge pull request #729 from KhronosGroup/fix-728

HLSL: Use same logic as GLSL for picking cbuffer block name.