Merge pull request #2231 from billhollings/fix-arg-buff-padding

Fix shader argument buffer padding and atomics.