mesa: fix convolve/convolution mix-ups