zink: use '2' barrier functions

'2' variants of functions have lower cpu overhead (for mesa drivers) because the base variants are just wrappers around them

eventually, the '2' variants will be widely enough deployed that this can be simplified/deleted