I have tested to return V_009910_ADDR_SURF_16_BANK in case 8 in si_num_banks, instead of V_009910_ADDR_SURF_8_BANK, and unigine have no glitches anymore. I test your patch right away.