What is the singular noun of glasses?

* For eyewear: The singular noun is glass.

* For drinking vessels: The singular noun is glass.

For example:

* "I need to get a new pair of glasses."

* "He drank from a glass of water."