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

[GLExtensions] Rename internal GetProcAddress function since it clashes with the global Windows function. Fix Windows function pointer grabbing.

This commit is contained in:
Ryan Houdek 2014-01-15 11:43:31 -06:00 committed by degasus
parent cd145cb63e
commit 29e0a90b88
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,9 @@
#if defined(__linux__) || defined(__APPLE__) #if defined(__linux__) || defined(__APPLE__)
#include <dlfcn.h> #include <dlfcn.h>
#endif #endif
#ifdef _WIN32
#include <windows.h>
#endif
#include <unordered_map> #include <unordered_map>
// gl_1_1 // gl_1_1
@ -776,6 +779,9 @@ namespace GLExtensions
bool _isES3; bool _isES3;
bool _isES; bool _isES;
u32 _GLVersion; u32 _GLVersion;
#ifdef _WIN32
HINSTANCE dllHandle = NULL;
#endif
std::unordered_map<std::string, bool> _extensionlist; std::unordered_map<std::string, bool> _extensionlist;
// Forward declared init functions // Forward declared init functions
bool init_gl_1_1(); bool init_gl_1_1();
@ -940,7 +946,7 @@ namespace GLExtensions
_GLVersion = 330; // Get all the fun things _GLVersion = 330; // Get all the fun things
} }
void* GetProcAddress(std::string name, void **func) void* GetFuncAddress(std::string name, void **func)
{ {
*func = GLInterface->GetProcAddress(name); *func = GLInterface->GetProcAddress(name);
if (*func == NULL) if (*func == NULL)
@ -948,6 +954,10 @@ namespace GLExtensions
#if defined(__linux__) || defined(__APPLE__) #if defined(__linux__) || defined(__APPLE__)
// Give it a second try with dlsym // Give it a second try with dlsym
*func = dlsym(RTLD_NEXT, name.c_str()); *func = dlsym(RTLD_NEXT, name.c_str());
#endif
#ifdef _WIN32
if (*func == NULL)
*func = (void*)GetProcAddress(dllHandle, (LPCSTR)name.c_str());
#endif #endif
if (*func == NULL && _isES) if (*func == NULL && _isES)
*func = (void*)0xFFFFFFFF; // Easy to determine invalid function, just so we continue on *func = (void*)0xFFFFFFFF; // Easy to determine invalid function, just so we continue on
@ -969,13 +979,15 @@ namespace GLExtensions
bool success = true; bool success = true;
_isES3 = GLInterface->GetMode() == GLInterfaceMode::MODE_OPENGLES3; _isES3 = GLInterface->GetMode() == GLInterfaceMode::MODE_OPENGLES3;
_isES = GLInterface->GetMode() == GLInterfaceMode::MODE_OPENGLES3 || GLInterface->GetMode() == GLInterfaceMode::MODE_OPENGLES2; _isES = GLInterface->GetMode() == GLInterfaceMode::MODE_OPENGLES3 || GLInterface->GetMode() == GLInterfaceMode::MODE_OPENGLES2;
#ifdef _WIN32
dllHandle = LoadLibrary(TEXT("OpenGL32.dll"));
#endif
// Grab glGetStringi and glGetIntegerv immediately // Grab glGetStringi and glGetIntegerv immediately
// We need them to grab the extension list // We need them to grab the extension list
// If it fails then the user's drivers don't support GL 3.0 // If it fails then the user's drivers don't support GL 3.0
if (GetProcAddress ("glGetIntegerv", (void**)&glGetIntegerv) == NULL) if (GetFuncAddress ("glGetIntegerv", (void**)&glGetIntegerv) == NULL)
return false; return false;
if (GetProcAddress("glGetStringi", (void**)&glGetStringi) == NULL) if (GetFuncAddress("glGetStringi", (void**)&glGetStringi) == NULL)
return false; return false;
InitVersion(); InitVersion();
@ -1020,9 +1032,9 @@ namespace GLExtensions
// eg if (GrabFunction(glGetStringi)) return true; // eg if (GrabFunction(glGetStringi)) return true;
#define GrabFunction(x) \ #define GrabFunction(x) \
(!!GetProcAddress(#x, (void**)&x)) (!!GetFuncAddress(#x, (void**)&x))
#define GrabFunctionSuffix(x, y) \ #define GrabFunctionSuffix(x, y) \
(!!GetProcAddress(#x #y, (void**)&x)) (!!GetFuncAddress(#x #y, (void**)&x))
bool init_gl_1_1() bool init_gl_1_1()
{ {