Move bitmap and next_bitmap from s->d1 to s->rlayer.d.