fix some semantic info mix-ups in calculate_vertex_layout()