d2d1: Introduce a separate structure for fill specific geometry fields.