gallium: reorder code to fix a recursive flush