Merge "Delete unused clip parameter in drawWithOpenGL"