ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1566 from Sonicadvance1/fix_gl21 

Fixes GLExtensions for GL 2.1 or GLES 2 devices.
This commit is contained in:
skidau 2014-11-19 12:47:23 +11:00
parent f7d1943615 3bfa15d2e1
commit 32f2cd8c7f
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp
View File

@ -1892,17 +1892,20 @@ namespace GLExtensions
// Grab a few functions for initial checking // Grab a few functions for initial checking
// We need them to grab the extension list // We need them to grab the extension list
// Also to check if there is an error grabbing the version // Also to check if there is an error grabbing the version
// If it fails then the user's drivers don't support GL 3.0
if (GetFuncAddress ("glGetIntegerv", (void**)&glGetIntegerv) == nullptr) if (GetFuncAddress ("glGetIntegerv", (void**)&glGetIntegerv) == nullptr)
return false; return false;
if (GetFuncAddress("glGetString", (void**)&glGetString) == nullptr) if (GetFuncAddress("glGetString", (void**)&glGetString) == nullptr)
return false; return false;
if (GetFuncAddress("glGetStringi", (void**)&glGetStringi) == nullptr)
return false;
if (GetFuncAddress("glGetError", (void**)&glGetError) == nullptr) if (GetFuncAddress("glGetError", (void**)&glGetError) == nullptr)
return false; return false;
InitVersion(); InitVersion();
// We need to use glGetStringi to get the extension list
// if we are using GLES3 or a GL version greater than 2.1
if (_GLVersion > 210 && GetFuncAddress("glGetStringi", (void**)&glGetStringi) == nullptr)
return false;
InitExtensionList(); InitExtensionList();
return InitFunctionPointers(); return InitFunctionPointers();