Added a no-tesselation version of the terrain vertex shader that still offsets height by heightmap data. This seem to work.