Try to fix #1887 by passing layer_height to fill_surface.

I'm not sure this is the right way to do it, but it seems to work for me with Rectilinear, at least.