Merge pull request #2389 from amdrexu/bugfix2

SPIRV: Fix some disassembly issues