Revert to setting markerShape from vertex shader

* More useful for cases like distinguishing point source ID, as is done
  in this commit.
Progress bar for file loading