Add show_axis_x to the test and keep the optimization?

From my shallow understanding of the logic, won't it become just like the if-else chain in lines under [1] ? (imagining all the possible combinations of grid, floor, overlay, x,y,z. )

if (pd->hide_overlays || !(show_axis_x || show_axis_y || show_axis_z || show_floor || show_ortho_grid))

doesn't help though.

[1] https://developer.blender.org/diffusion/B/browse/master/source/blender/draw/engines/overlay/overlay_grid.c$76

Just tested all combos: problematic one is: (grid, floor, x,y )all off. Turn on Z, it sticks despite toggling it off.
(testing some variations now. )

Note this code in OVERLAY_grid_cache_init:

if ((shd->grid_flag == 0 && shd->zpos_flag == 0) || !DRW_state_is_fbo()) {
  return;
}

I think what's missing is always clearing shd->zpos_flag and shd->zneg_flag at the start of OVERLAY_grid_init along with shd->grid_flag.

Polite reminder for committing this.