Merge "Remove points from fixed function. Add basic GL performance test."