OS X: Consolidate the SoftGL plug-in's OpenGL functions into one file again.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@92231 e17a0e51-4ae3-4d35-97c3-1a29b211df97
OS X: Fix the SoftGL driver.
I knew I was overlooking something...

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@92232 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Merge branch 'master' into SwiftTesting

Conflicts:
	macosx/Pcsxr.xcodeproj/project.pbxproj