Merge pull request #2142 from Sonicadvance1/fix_gles31_non_nvidia Fix OpenGL ES 3.1 on non-Nvidia devices.
