Merge "Revert "fix drawWithOpengl""