Removed useless GLenum array.
Updated main app to cherry-pick merge.