diff options
| author | Ryan Houdek <Sonicadvance1@Gmail.com> | 2014-01-18 14:10:24 +0000 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@Gmail.com> | 2014-01-18 14:10:24 +0000 |
| commit | bea484e12f98f67eafafeb8db6d3181020fdfb46 (patch) | |
| tree | 06ae3284c8693861d3a8a5965d1a4217ecfbeab5 /Source/Core/VideoBackends | |
| parent | 839df31347cd1331c5426c2eae549371d7ae160f (diff) | |
Move Win32 specific function grabbing fallback to WGL.cpp. Fixes issue 6964.
Diffstat (limited to 'Source/Core/VideoBackends')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp b/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp index 68803eb3a8..d8c7a416e5 100644 --- a/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp +++ b/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp @@ -8,9 +8,6 @@ #if defined(__linux__) || defined(__APPLE__) #include <dlfcn.h> #endif -#ifdef _WIN32 -#include <windows.h> -#endif #include <unordered_map> // gl_1_1 @@ -779,9 +776,6 @@ namespace GLExtensions bool _isES3; bool _isES; u32 _GLVersion; -#ifdef _WIN32 - HINSTANCE dllHandle = NULL; -#endif std::unordered_map<std::string, bool> _extensionlist; // Forward declared init functions bool init_gl_1_1(); @@ -955,10 +949,6 @@ namespace GLExtensions // Give it a second try with dlsym *func = dlsym(RTLD_NEXT, name.c_str()); #endif -#ifdef _WIN32 - if (*func == NULL) - *func = (void*)GetProcAddress(dllHandle, (LPCSTR)name.c_str()); -#endif if (*func == NULL && _isES) *func = (void*)0xFFFFFFFF; // Easy to determine invalid function, just so we continue on if (*func == NULL) @@ -979,9 +969,7 @@ namespace GLExtensions bool success = true; _isES3 = GLInterface->GetMode() == GLInterfaceMode::MODE_OPENGLES3; _isES = GLInterface->GetMode() == GLInterfaceMode::MODE_OPENGLES3 || GLInterface->GetMode() == GLInterfaceMode::MODE_OPENGLES2; -#ifdef _WIN32 - dllHandle = LoadLibrary(TEXT("OpenGL32.dll")); -#endif + // Grab glGetStringi and glGetIntegerv immediately // We need them to grab the extension list // If it fails then the user's drivers don't support GL 3.0 |
