Merge "mesa3d: fix -Wunreachable-code-loop-increment"