am 6afc5cf3: Merge "Prevent calling GL functions with an invalid surface"

* commit '6afc5cf3d9e1a0c0eb6ecd6eea258f1ccd37bef3':
  Prevent calling GL functions with an invalid surface