If that doesn't work, then try dedicated water spot remover
Even if that doesn't work, try wheel acid.
If nothing works, then you need to compound glass. This is a very messy process. Not easy to do. You need to use special glass compound and pads designed for glass polishing.