store bytes_per_pixel in VdpOutputSurfaceData rather than recompute its value
style changes: make if/then/else clauses appear on different lines

that should simplify test coverage estimation