VBO reviewed changes

Subset of !3591 (merged)

Intel CI passes: https://mesa-ci.01.org/mareko/builds/2/group/63a9f0ea7bb98050796b649e85481845